Similarly to commit 8cdb2cef3f1, move the tools-only and softfloat test to GitLab (splitting it in 2 different jobs).
Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> --- Cc: Alex Bennée <alex.ben...@linaro.org> Cc: Emilio G. Cota <c...@braap.org> --- .gitlab-ci.yml | 14 ++++++++++++++ .travis.yml | 9 --------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a91870cf85e..a799803afb9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -297,6 +297,20 @@ build-tcg-disabled: 208 209 215 216 218 222 227 234 246 247 248 250 254 255 257 258 260 261 262 263 264 270 272 273 277 279 +build-tools: + <<: *native_build_job_definition + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --enable-tools --disable-system --disable-user + +# run minimal unit and softfloat checks +build-softfloat: + <<: *native_build_job_definition + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --disable-tools --disable-system --disable-user + MAKE_CHECK_ARGS: check-unit check-softfloat + build-user: <<: *native_build_job_definition variables: diff --git a/.travis.yml b/.travis.yml index 5fb69c5fb02..15550fb023f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -119,15 +119,6 @@ after_script: jobs: include: - # Just build tools and run minimal unit and softfloat checks - - name: "GCC check-unit and check-softfloat" - env: - - BASE_CONFIG="--enable-tools" - - CONFIG="--disable-user --disable-system" - - TEST_CMD="make check-unit check-softfloat -j${JOBS}" - - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" - - # --enable-debug implies --enable-debug-tcg, also runs quite a bit slower - name: "GCC debug (main-softmmu)" env: -- 2.26.2