Similarly to commit 8cdb2cef3f1, move the coroutine tests to GitLab.
Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
---
Cc: Stefan Hajnoczi <stefa...@redhat.com>
Cc: Kevin Wolf <kw...@redhat.com>
---
.gitlab-ci.yml | 16 ++++++++++++++++
.travis.yml | 14 --------------
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a799803afb9..6552a832939 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -475,6 +475,22 @@ build-tci:
- QTEST_QEMU_BINARY="./qemu-system-x86_64" ./tests/qtest/pxe-test
- QTEST_QEMU_BINARY="./qemu-system-s390x" ./tests/qtest/pxe-test -m slow
+# Alternate coroutines implementations are only really of interest to KVM users
+# However we can't test against KVM on Travis so we can only run unit tests
+build-coroutine-ucontext:
+ <<: *native_build_job_definition
+ variables:
+ IMAGE: ubuntu2004
+ CONFIGURE_ARGS: --with-coroutine=ucontext --disable-tcg
+ MAKE_CHECK_ARGS: check-unit
+
+build-coroutine-sigaltstack:
+ <<: *native_build_job_definition
+ variables:
+ IMAGE: ubuntu2004
+ CONFIGURE_ARGS: --with-coroutine=sigaltstack --disable-tcg
+ MAKE_CHECK_ARGS: check-unit
+
# Most jobs test latest gcrypt or nettle builds
#
# These jobs test old gcrypt and nettle from RHEL7
diff --git a/.travis.yml b/.travis.yml
index 15550fb023f..8ef31f8d8b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -139,20 +139,6 @@ jobs:
- CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
- # Alternate coroutines implementations are only really of interest to KVM
users
- # However we can't test against KVM on Travis so we can only run unit tests
- - name: "check-unit coroutine=ucontext"
- env:
- - CONFIG="--with-coroutine=ucontext --disable-tcg"
- - TEST_CMD="make check-unit -j${JOBS} V=1"
-
-
- - name: "check-unit coroutine=sigaltstack"
- env:
- - CONFIG="--with-coroutine=sigaltstack --disable-tcg"
- - TEST_CMD="make check-unit -j${JOBS} V=1"
-
-
# Check we can build docs and tools (out of tree)
- name: "tools and docs (bionic)"
dist: bionic
--
2.26.2
