From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Sat, 12 Jan 2019 09:48:13 +0000 (+0100)
Subject: test: limit environments for systemd-hwdb-update under ASan
X-Git-Tag: v241-rc1~78^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d7283fc157ceb3360b21f27eee87dd794aa50f06;p=thirdparty%2Fsystemd.git

test: limit environments for systemd-hwdb-update under ASan
---

diff --git a/test/test-functions b/test/test-functions
index d9ecc656611..498dc82b18a 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -360,8 +360,9 @@ printf "[Service]\nEnvironment=ASAN_OPTIONS=\$DEFAULT_ASAN_OPTIONS:log_path=/sys
 
 # 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.
+# Let's limit which environments such services should be executed in.
 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
+printf "[Unit]\nConditionVirtualization=container\n\n[Service]\nTimeoutSec=180s\n" >/etc/systemd/system/systemd-hwdb-update.service.d/env-override.conf
 
 export ASAN_OPTIONS=\$DEFAULT_ASAN_OPTIONS:log_path=/systemd.asan.log UBSAN_OPTIONS=\$DEFAULT_UBSAN_OPTIONS
 exec  $ROOTLIBDIR/systemd "\$@"