From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 31 Aug 2022 14:10:43 +0000 (+0900)
Subject: test-29-portable: extend timeout for slower environment
X-Git-Tag: v252-rc1~285^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fff8e1fdd222f8f05b9ecf170814a9059acfc78;p=thirdparty%2Fsystemd.git

test-29-portable: extend timeout for slower environment
---

diff --git a/test/units/testsuite-29.sh b/test/units/testsuite-29.sh
index 3b1395619ac..e56dad991e4 100755
--- a/test/units/testsuite-29.sh
+++ b/test/units/testsuite-29.sh
@@ -5,6 +5,17 @@
 set -eux
 set -o pipefail
 
+# Set longer timeout for slower machines, e.g. non-KVM vm.
+mkdir -p /run/systemd/system.conf.d
+cat >/run/systemd/system.conf.d/10-timeout.conf <<EOF
+DefaultEnvironment=SYSTEMD_DISSECT_VERITY_TIMEOUT_SEC=30
+ManagerEnvironment=SYSTEMD_DISSECT_VERITY_TIMEOUT_SEC=30
+EOF
+
+systemctl daemon-reexec
+
+export SYSTEMD_DISSECT_VERITY_TIMEOUT_SEC=30
+
 ARGS=()
 state_directory=/var/lib/private/
 if [[ -v ASAN_OPTIONS || -v UBSAN_OPTIONS ]]; then