system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-14 12:04:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: send stdout/stderr of testsuite units to journal & console

Browse source 
to make debugging in CIs slightly easier.
This commit is contained in:
Frantisek Sumsal 2022-06-16 22:16:53 +02:00 committed by Yu Watanabe
parent 75176c7914
commit ba7abf79a5
7 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/test-functions
View file

@ -2941,6 +2941,18 @@ test_setup() {
mask_supporting_services
fi
# Send stdout/stderr of testsuite-*.service units to both journal and
# console to make debugging in CIs easier
# Note: we can't use a dropin for `testsuite-.service`, since that also
# overrides 'sub-units' of some tests that already use a specific
# value for Standard(Output|Error)=
# (e.g. test/units/testsuite-66-deviceisolation.service)
if ! get_bool "$INTERACTIVE_DEBUG"; then
local dropin_dir="${initdir:?}/etc/systemd/system/testsuite-${TESTID:?}.service.d"
mkdir -p "$dropin_dir"
printf '[Service]\nStandardOutput=journal+console\nStandardError=journal+console' >"$dropin_dir/99-stdout.conf"
fi
if get_bool "$hook_defined"; then
test_append_files "${initdir:?}"
fi

2
test/units/testsuite-22.service
View file

@ -9,5 +9,3 @@ Wants=getty-pre.target
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot
StandardOutput=tty
StandardError=tty

2
test/units/testsuite-35.service
View file

@ -5,6 +5,4 @@ Description=TEST-35-LOGIN
[Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
StandardOutput=journal+console
StandardError=journal+console
Type=oneshot

2
test/units/testsuite-45.service
View file

@ -5,6 +5,4 @@ Description=TEST-45-TIMEDATE
[Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
StandardOutput=journal+console
StandardError=journal+console
Type=oneshot

2
test/units/testsuite-64.service
View file

@ -6,5 +6,3 @@ Description=TEST-64-UDEV
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot
StandardOutput=journal+console
StandardError=journal+console

2
test/units/testsuite-71.service
View file

@ -5,6 +5,4 @@ Description=TEST-71-HOSTNAME
[Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
StandardOutput=journal+console
StandardError=journal+console
Type=oneshot

2
test/units/testsuite-73.service
View file

@ -5,6 +5,4 @@ Description=TEST-73-LOCALE
[Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
StandardOutput=journal+console
StandardError=journal+console
Type=oneshot