]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: fix debugging of nspawn tests
authorFrantisek Sumsal <frantisek@sumsal.cz>
Mon, 28 Aug 2023 20:42:36 +0000 (22:42 +0200)
committerLuca Boccassi <luca.boccassi@gmail.com>
Tue, 29 Aug 2023 00:08:08 +0000 (01:08 +0100)
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.

test/test-functions

index 8b23466877682904578d7587df85bac623256834..1193a1623904b20304265ec808d59b8d52326395 100644 (file)
@@ -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