diff options
| author | Evgeny Vereshchagin <evvers@ya.ru> | 2019-05-14 13:04:42 +0200 |
|---|---|---|
| committer | Evgeny Vereshchagin <evvers@ya.ru> | 2019-05-14 13:04:42 +0200 |
| commit | bedae21ec53cc8695525f75dc937194bd72cecc3 (patch) | |
| tree | e5d639868259db1206be1e2962dc7bac4d968d0e /travis-ci | |
| parent | 5de55cc8656042281b9b6d259242f6513c14c9ab (diff) | |
| download | systemd-bedae21ec53cc8695525f75dc937194bd72cecc3.tar.gz | |
tests: set NSPAWN_TIMEOUT and QEMU_TIMEOUT explicitly
These were never set explictily because we relied on Travis CI
canceling a job if it's been stuck for 10 minutes. Now that
the script is run on Azure Pipelines (where the default timeout
is 60 minutes) we should limit the script manually to avoid waiting
for an hour for broken jobs to finish.
Diffstat (limited to 'travis-ci')
| -rwxr-xr-x | travis-ci/managers/xenial.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/travis-ci/managers/xenial.sh b/travis-ci/managers/xenial.sh index e1c5d77cbf..e2e3273822 100755 --- a/travis-ci/managers/xenial.sh +++ b/travis-ci/managers/xenial.sh @@ -15,9 +15,10 @@ sed -i 's/2\.30/2.27/' meson.build meson --werror -Db_sanitize=address,undefined -Dsplit-usr=true build ninja -v -C build -make -C test/TEST-01-BASIC clean setup run TEST_NO_QEMU=yes NSPAWN_ARGUMENTS=--keep-unit RUN_IN_UNPRIVILEGED_CONTAINER=no + +make -C test/TEST-01-BASIC clean setup run NSPAWN_TIMEOUT=600 TEST_NO_QEMU=yes NSPAWN_ARGUMENTS=--keep-unit RUN_IN_UNPRIVILEGED_CONTAINER=no # Now that we're more or less sure that ASan isn't going to crash systemd and cause a kernel panic # let's also run the test with QEMU to cover udevd, sysctl and everything else that isn't run # in containers. -make -C test/TEST-01-BASIC clean setup run TEST_NO_NSPAWN=yes +make -C test/TEST-01-BASIC clean setup run QEMU_TIMEOUT=900 TEST_NO_NSPAWN=yes |