test: Rename INTERACTIVE_DEBUG to TEST_SHELL

(cherry picked from commit 33f400a9e05f3a09d28ac3d8251cf82592a207c6)

diff --git a/test/README.testsuite b/test/README.testsuite
index 22da1cd1a117a9b49ae12704a3dbd1f9967d4b1c..c1b048a93d7aaba20edee0eeb1094aa61b99bdb6 100644 (file)
--- a/test/README.testsuite
+++ b/test/README.testsuite
@@ -181,7 +181,7 @@ sec).
 `NSPAWN_TIMEOUT=infinity`: Set a timeout for tests under systemd-nspawn
 (defaults to 1800 sec).
 
-`INTERACTIVE_DEBUG=1`: Configure the machine to be more *user-friendly* for
+`TEST_SHELL=1`: Configure the machine to be more *user-friendly* for
 interactive debugging (e.g. by setting a usable default terminal, suppressing
 the shutdown after the test, etc.).
 
@@ -200,11 +200,11 @@ one with `$QEMU_BIN`.
 
 ### Debugging the qemu image
 
-If you want to log in the testsuite virtual machine, use `INTERACTIVE_DEBUG=1`
+If you want to log in the testsuite virtual machine, use `TEST_SHELL=1`
 and log in as root:
 
 ```shell
-$ sudo make -C test/TEST-01-BASIC INTERACTIVE_DEBUG=1 run
+$ sudo make -C test/TEST-01-BASIC TEST_SHELL=1 run
 ```
 
 The root password is empty.

diff --git a/test/TEST-04-JOURNAL/test.sh b/test/TEST-04-JOURNAL/test.sh
index a7aa71fce321a93bc6d742b83547cb17dd4a753e..01d0b66ee7ae92f4a25f69fbb6dc8032f35dcb22 100755 (executable)
--- a/test/TEST-04-JOURNAL/test.sh
+++ b/test/TEST-04-JOURNAL/test.sh
@@ -19,7 +19,7 @@ test_append_files() {
 
     # Since we nuke the journal repeatedly during this test, let's redirect
     # stdout/stderr to the console as well to make the test a bit more debug-able.
-    if ! get_bool "${INTERACTIVE_DEBUG:-}"; then
+    if ! get_bool "${TEST_SHELL:-}"; then
         dropin_dir="${workspace:?}/etc/systemd/system/TEST-04-JOURNAL.service.d/"
         mkdir -p "$dropin_dir"
         printf '[Service]\nStandardOutput=journal+console\nStandardError=journal+console' >"$dropin_dir/99-stdout.conf"

diff --git a/test/test-functions b/test/test-functions
index e219812e726cab86b3a260be889a30ac13577ada..04fe20f5478c963f26a7f913accb191689d9062f 100644 (file)
--- a/test/test-functions
+++ b/test/test-functions
@@ -570,7 +570,7 @@ run_qemu() {
         ${TEST_MATCH_TESTCASE:+"systemd.setenv=TEST_MATCH_TESTCASE=$TEST_MATCH_TESTCASE"}
     )
 
-    if ! get_bool "$INTERACTIVE_DEBUG" && ! get_bool "$TEST_SKIP_SHUTDOWN"; then
+    if ! get_bool "$TEST_SHELL" && ! get_bool "$TEST_SKIP_SHUTDOWN"; then
         kernel_params+=(
             "panic=1"
             "softlockup_panic=1"
@@ -664,7 +664,7 @@ run_nspawn() {
         ${TEST_MATCH_TESTCASE:+"systemd.setenv=TEST_MATCH_TESTCASE=$TEST_MATCH_TESTCASE"}
     )
 
-    if get_bool "$INTERACTIVE_DEBUG"; then
+    if get_bool "$TEST_SHELL"; then
         nspawn_options+=("--console=interactive")
     elif ! get_bool "$TEST_SKIP_SHUTDOWN"; then
         kernel_params+=("systemd.wants=end.service")
@@ -1984,7 +1984,7 @@ install_debug_tools() {
     dinfo "Install debug tools"
     image_install -o "${DEBUGTOOLS[@]}"
 
-    if get_bool "$INTERACTIVE_DEBUG"; then
+    if get_bool "$TEST_SHELL"; then
         # Set default TERM from vt220 to linux, so at least basic key shortcuts work
         local getty_override="${initdir:?}/etc/systemd/system/serial-getty@.service.d"
         mkdir -p "$getty_override"