From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Mon, 28 Aug 2023 20:42:36 +0000 (+0200)
Subject: test: fix debugging of nspawn tests
X-Git-Tag: v255-rc1~626
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5599c84bcdbb712f3c8d173c117c6d672c8c7a48;p=thirdparty%2Fsystemd.git

test: fix debugging of nspawn tests

The pipe stuff introduced in 701e0c2660 causes nspawn to switch the
console from 'interactive' into 'read-only' which is a bit useless when
debugging. Let's set --console=interactive explicitly in such case.

Follow-up to 701e0c2660.
---

diff --git a/test/test-functions b/test/test-functions
index 8b234668776..1193a162390 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -659,7 +659,9 @@ run_nspawn() {
         ${TEST_MATCH_TESTCASE:+"systemd.setenv=TEST_MATCH_TESTCASE=$TEST_MATCH_TESTCASE"}
     )
 
-    if ! get_bool "$INTERACTIVE_DEBUG"; then
+    if get_bool "$INTERACTIVE_DEBUG"; then
+        nspawn_options+=("--console=interactive")
+    else
         kernel_params+=("systemd.wants=end.service")
     fi