From 8cdb2cef3f1c5f0d7c1fb96ed337d27d9b6267d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Fri, 2 Oct 2020 11:32:23 +0100 Subject: [PATCH] gitlab: move linux-user plugins test across to gitlab MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Thomas Huth Message-Id: <20201002103223.24022-1-alex.bennee@linaro.org> --- .gitlab-ci.yml | 11 +++++++++++ .travis.yml | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c265e7f8ab..346f23acf7 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 c255c331a7..519e62432d 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: