shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-11 20:58:27 +03:00
Code

test: Rename INTERACTIVE_DEBUG to TEST_SHELL

Browse Source 
(cherry picked from commit 33f400a9e05f3a09d28ac3d8251cf82592a207c6)
This commit is contained in:
Daan De Meyer 2024-08-02 16:16:14 +02:00 committed by Luca Boccassi
parent 52897cf6a4
commit 039af94fb5
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/README.testsuite
View File

@ -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.

2
test/TEST-04-JOURNAL/test.sh
View File

@ -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"

6
test/test-functions
View File

@ -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"