test: support V being unset

Support `V` being unset when using `set -u`.

diff --git a/test/modules.d/70test-root/module-setup.sh b/test/modules.d/70test-root/module-setup.sh
index 055b5b891bcc732034b41dd3b16787cde8ddce0c..ac249dba355be9a2475a6324e20acbecde33daa7 100755 (executable)
--- a/test/modules.d/70test-root/module-setup.sh
+++ b/test/modules.d/70test-root/module-setup.sh
@@ -9,7 +9,7 @@ depends() {
     local deps
     deps="terminfo"
 
-    if [[ $V == "2" ]]; then
+    if [[ ${V-} == "2" ]]; then
         deps+=" debug"
     fi
 

diff --git a/test/test-container.sh b/test/test-container.sh
index 324ba97199fd4bdccbb4dd85d0bcc017df471f30..81e41c951c99b7ceb711000bd73d50c16ad847d6 100755 (executable)
--- a/test/test-container.sh
+++ b/test/test-container.sh
@@ -9,7 +9,7 @@ if command -v systemd-detect-virt > /dev/null && ! systemd-detect-virt -c &> /de
 fi
 
 set -e
-if [ "$V" = "2" ]; then set -x; fi
+if [ "${V-}" = "2" ]; then set -x; fi
 
 [[ -d ${0%/*} ]] && cd "${0%/*}"/../
 

diff --git a/test/test-functions b/test/test-functions
index 775c01891b93c8e9ab5592dba7f816f587d8a9ad..066e47cda13e98e175b287959302eed5e5f5c49b 100644 (file)
--- a/test/test-functions
+++ b/test/test-functions
@@ -23,11 +23,11 @@ fi
 
 TEST_KERNEL_CMDLINE+=" root=LABEL=dracut panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot $DEBUGFAIL "
 
-if [[ $V != "1" && $V != "2" ]]; then
+if [[ ${V-} != "1" && ${V-} != "2" ]]; then
     TEST_KERNEL_CMDLINE+="quiet "
 fi
 
-if [[ $V == "2" ]]; then
+if [[ ${V-} == "2" ]]; then
     TEST_KERNEL_CMDLINE+="rd.debug "
 fi
 
@@ -72,7 +72,7 @@ wait_for_server_startup() {
 
     echo "Waiting for the server to startup"
     while ! grep -q Serving "$TESTDIR"/server.log; do
-        if [ "$V" -ge 1 ]; then
+        if [ "${V-}" -ge 1 ]; then
             lines=$(wc -l "$TESTDIR"/server.log | cut -f 1 -d ' ')
             if [ "$lines" -gt "$printed_lines" ]; then
                 tail -n "+$((printed_lines + 1))" "$TESTDIR"/server.log
@@ -264,7 +264,7 @@ while (($# > 0)); do
         --all)
             set_test_envonment_variables
             if ! test_check 2 &> test${TEST_RUN_ID:+-$TEST_RUN_ID}.log; then
-                if [[ $V == "1" || $V == "2" ]]; then
+                if [[ ${V-} == "1" || ${V-} == "2" ]]; then
                     cat test${TEST_RUN_ID:+-$TEST_RUN_ID}.log
                 fi
                 echo -e "TEST: $TEST_DESCRIPTION " "$COLOR_WARNING" "[SKIPPED]" "$COLOR_NORMAL"
@@ -272,7 +272,7 @@ while (($# > 0)); do
             else
                 echo -e "TEST: $TEST_DESCRIPTION " "$COLOR_SUCCESS" "[STARTED]" "$COLOR_NORMAL"
             fi
-            if [[ $V == "1" || $V == "2" ]]; then
+            if [[ ${V-} == "1" || ${V-} == "2" ]]; then
                 tee_command="tee"
                 set -o pipefail
                 (
@@ -303,7 +303,7 @@ while (($# > 0)); do
                 echo -e "TEST: $TEST_DESCRIPTION " "$COLOR_SUCCESS" "[OK]" "$COLOR_NORMAL"
             else
                 echo -e "TEST: $TEST_DESCRIPTION " "$COLOR_FAILURE" "[FAILED]" "$COLOR_NORMAL"
-                if [ "$V" == "2" ]; then
+                if [ "${V-}" == "2" ]; then
                     tail -c 1048576 "$(pwd)/server${TEST_RUN_ID:+-$TEST_RUN_ID}.log" "$(pwd)/test${TEST_RUN_ID:+-$TEST_RUN_ID}.log"
                     echo -e "TEST: $TEST_DESCRIPTION " "$COLOR_FAILURE" "[FAILED]" "$COLOR_NORMAL"
                 else