From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Mon, 24 Dec 2018 00:15:43 +0000 (+0100)
Subject: tests: overwrite a hard-coded timeout in systemd-hwdb-update.service
X-Git-Tag: v241-rc1~114^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=082bcdca2cff8e421e7207ad20ab3aa931ba2833;p=thirdparty%2Fsystemd.git

tests: overwrite a hard-coded timeout in systemd-hwdb-update.service
---

diff --git a/test/test-functions b/test/test-functions
index 350cb4ff21e..bda62e9f7f0 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -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