aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Vereshchagin <evvers@ya.ru>2018-11-08 13:45:46 +0100
committerEvgeny Vereshchagin <evvers@ya.ru>2018-11-08 13:49:46 +0100
commitcdd116b4e1fe3e641e69fe76d69ee0ae3490fede (patch)
tree4c89d3fa1162127507bc0c296b637b0e3bc64e08 /travis-ci
parenttravis.yml: replace test-capability with a script exiting with 77 (diff)
downloadsystemd-cdd116b4e1fe3e641e69fe76d69ee0ae3490fede.tar.gz
systemd-cdd116b4e1fe3e641e69fe76d69ee0ae3490fede.tar.bz2
systemd-cdd116b4e1fe3e641e69fe76d69ee0ae3490fede.zip
travis: use 3 times the normal timeout when the tests are run under ASan+UBSan
Diffstat (limited to 'travis-ci')
-rwxr-xr-xtravis-ci/managers/fedora.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/travis-ci/managers/fedora.sh b/travis-ci/managers/fedora.sh
index 2705e23f8..742b7c94a 100755
--- a/travis-ci/managers/fedora.sh
+++ b/travis-ci/managers/fedora.sh
@@ -56,7 +56,7 @@ for phase in "${PHASES[@]}"; do
$DOCKER_EXEC sh -c "printf '#!/bin/sh\necho The test is failing under ASan, skipping; exit 77' >/build/build/test-capability"
# Never remove halt_on_error from UBSAN_OPTIONS. See https://github.com/systemd/systemd/commit/2614d83aa06592aedb.
- $DOCKER_EXEC sh -c "UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1 ninja -C build test"
+ $DOCKER_EXEC sh -c "UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1 meson test --timeout-multiplier=3 -C ./build/ --print-errorlogs"
;;
CLEANUP)
info "Cleanup phase"