]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
tests: overwrite a hard-coded timeout in systemd-hwdb-update.service
authorEvgeny Vereshchagin <evvers@ya.ru>
Mon, 24 Dec 2018 00:15:43 +0000 (01:15 +0100)
committerEvgeny Vereshchagin <evvers@ya.ru>
Sat, 29 Dec 2018 18:14:35 +0000 (19:14 +0100)
test/test-functions

index 350cb4ff21e3b576888ac358818e56ef319d49ec..bda62e9f7f016a7614c5639512ded531dab53cf7 100644 (file)
@@ -354,6 +354,11 @@ JOURNALD_CONF_DIR=/etc/systemd/system/systemd-journald.service.d
 mkdir -p "\$JOURNALD_CONF_DIR"
 printf "[Service]\nEnvironment=ASAN_OPTIONS=\$DEFAULT_ASAN_OPTIONS:log_path=/systemd-journald.asan.log\n" >"\$JOURNALD_CONF_DIR/env.conf"
 
+# 90s isn't enough for some services to finish when literally everything is run
+# under ASan+UBSan in containers, which, in turn, are run in VMs.
+mkdir -p /etc/systemd/system/systemd-hwdb-update.service.d
+printf "[Service]\nTimeoutSec=180s\n" >/etc/systemd/system/systemd-hwdb-update.service.d/timeout.conf
+
 export ASAN_OPTIONS=\$DEFAULT_ASAN_OPTIONS:log_path=/systemd.asan.log UBSAN_OPTIONS=\$DEFAULT_UBSAN_OPTIONS
 exec  $ROOTLIBDIR/systemd "\$@"
 EOF