From: Jay Burger <jay.burger@fujitsu.com>
Date: Thu, 21 May 2020 23:08:48 +0000 (-0500)
Subject: fix_test_function_timeout
X-Git-Tag: v246-rc1~240
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eed44b715d18295d9f408fe240c29e3c6a7f5272;p=thirdparty%2Fsystemd.git

fix_test_function_timeout
---

diff --git a/test/test-functions b/test/test-functions
index e4d690a4e95..7302b207b0a 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -395,9 +395,9 @@ run_nspawn() {
         dwarn "nspawn doesn't support SYSTEMD_NSPAWN_UNIFIED_HIERARCHY=hybrid, skipping"
         exit
     elif [[ "$UNIFIED_CGROUP_HIERARCHY" = "yes" || "$UNIFIED_CGROUP_HIERARCHY" = "no" ]]; then
-        _nspawn_pre=("${nspawn_pre[@]}" env SYSTEMD_NSPAWN_UNIFIED_HIERARCHY=$UNIFIED_CGROUP_HIERARCHY)
+        _nspawn_pre=("${_nspawn_pre[@]}" env SYSTEMD_NSPAWN_UNIFIED_HIERARCHY=$UNIFIED_CGROUP_HIERARCHY)
     elif [[ "$UNIFIED_CGROUP_HIERARCHY" = "default" ]]; then
-        _nspawn_pre=("${nspawn_pre[@]}" env --unset=UNIFIED_CGROUP_HIERARCHY --unset=SYSTEMD_NSPAWN_UNIFIED_HIERARCHY)
+        _nspawn_pre=("${_nspawn_pre[@]}" env --unset=UNIFIED_CGROUP_HIERARCHY --unset=SYSTEMD_NSPAWN_UNIFIED_HIERARCHY)
     else
         dfatal "Unknown UNIFIED_CGROUP_HIERARCHY. Got $UNIFIED_CGROUP_HIERARCHY, expected [yes|no|hybrid|default]"
         exit 1