]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
tests: override a hard-coded timeout that kicks in too early (under ASan+UBSan)
authorEvgeny Vereshchagin <evvers@ya.ru>
Fri, 10 May 2019 16:33:35 +0000 (18:33 +0200)
committerEvgeny Vereshchagin <evvers@ya.ru>
Sun, 12 May 2019 01:37:36 +0000 (03:37 +0200)
The test has failed two times today: https://travis-ci.org/systemd/systemd/jobs/530750626
and https://travis-ci.org/systemd/systemd/jobs/530759465.

test/test-functions

index f8dc44a6ef3f4f075803e92cbf8c6c4ff858e72c..30b559097b868d44d8a2fb5997b2ed347499180f 100644 (file)
@@ -391,6 +391,10 @@ printf "[Service]\nStandardOutput=file:/systemd-journald.out\n" >"\$JOURNALD_CON
 mkdir -p /etc/systemd/system/systemd-hwdb-update.service.d
 printf "[Unit]\nConditionVirtualization=container\n\n[Service]\nTimeoutSec=180s\n" >/etc/systemd/system/systemd-hwdb-update.service.d/env-override.conf
 
+# Let's override another hard-coded timeout that kicks in too early
+mkdir -p /etc/systemd/system/systemd-journal-flush.service.d
+printf "[Service]\nTimeoutSec=180s\n" >/etc/systemd/system/systemd-journal-flush.service.d/timeout.conf
+
 # The 'mount' utility doesn't behave well under libasan, causing unexpected
 # fails during boot and subsequent test results check:
 # bash-5.0# mount -o remount,rw -v /