aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2020-10-02 11:32:23 +0100
committerAlex Bennée <alex.bennee@linaro.org>2020-10-02 12:31:25 +0100
commit8cdb2cef3f1c5f0d7c1fb96ed337d27d9b6267d6 (patch)
tree0b91c6468212a162de9080e8f1429581b2db4d3c
parent1b11f28d05121fec43a12389b673cc2d7e1d2e26 (diff)
downloadqemu-8cdb2cef3f1c5f0d7c1fb96ed337d27d9b6267d6.zip
qemu-8cdb2cef3f1c5f0d7c1fb96ed337d27d9b6267d6.tar.gz
qemu-8cdb2cef3f1c5f0d7c1fb96ed337d27d9b6267d6.tar.bz2
gitlab: move linux-user plugins test across to gitlab
Even with the recent split moving beefier plugins into contrib and dropping them from the check-tcg tests we are still hitting time limits. This possibly points to a slow down of --debug-tcg but seeing as we are migrating stuff to gitlab we might as well move there and bump the timeout. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-Id: <20201002103223.24022-1-alex.bennee@linaro.org>
-rw-r--r--.gitlab-ci.yml11
-rw-r--r--.travis.yml11
2 files changed, 11 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c265e7f..346f23a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -244,6 +244,17 @@ build-user:
CONFIGURE_ARGS: --disable-tools --disable-system
MAKE_CHECK_ARGS: check-tcg
+# Run check-tcg against linux-user (with plugins)
+# we skip sparc64-linux-user until it has been fixed somewhat
+# we skip cris-linux-user as it doesn't use the common run loop
+build-user-plugins:
+ <<: *native_build_job_definition
+ variables:
+ IMAGE: debian-all-test-cross
+ CONFIGURE_ARGS: --disable-tools --disable-system --enable-plugins --enable-debug-tcg --target-list-exclude=sparc64-linux-user,cris-linux-user
+ MAKE_CHECK_ARGS: check-tcg
+ timeout: 1h 30m
+
build-clang:
<<: *native_build_job_definition
variables:
diff --git a/.travis.yml b/.travis.yml
index c255c33..519e624 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -311,17 +311,6 @@ jobs:
- CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
- # Run check-tcg against linux-user (with plugins)
- # we skip sparc64-linux-user until it has been fixed somewhat
- # we skip cris-linux-user as it doesn't use the common run loop
- - name: "GCC plugins check-tcg (user)"
- env:
- - CONFIG="--disable-system --enable-plugins --enable-debug-tcg --target-list-exclude=sparc64-linux-user,cris-linux-user"
- - TEST_BUILD_CMD="make build-tcg"
- - TEST_CMD="make check-tcg"
- - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
-
-
# Run check-tcg against softmmu targets
- name: "GCC check-tcg (some-softmmu)"
env: