|
 |
8d419f |
From 4dd51db0381048f15973dc0046fe5fdec1f40aa8 Mon Sep 17 00:00:00 2001
|
|
|
8d419f |
From: Frantisek Sumsal <frantisek@sumsal.cz>
|
|
|
8d419f |
Date: Thu, 16 Jun 2022 22:16:53 +0200
|
|
|
8d419f |
Subject: [PATCH] test: send stdout/stderr of testsuite units to journal &
|
|
|
8d419f |
console
|
|
|
8d419f |
|
|
|
8d419f |
to make debugging in CIs slightly easier.
|
|
|
8d419f |
|
|
|
8d419f |
(cherry picked from commit ba7abf79a5a2df2a93332fc32e8e3c268c74abc7)
|
|
|
8d419f |
|
|
|
8d419f |
Related: #2087652
|
|
|
8d419f |
---
|
|
|
8d419f |
test/test-functions | 12 ++++++++++++
|
|
|
8d419f |
test/units/testsuite-22.service | 2 --
|
|
|
8d419f |
test/units/testsuite-35.service | 2 --
|
|
|
8d419f |
test/units/testsuite-45.service | 2 --
|
|
|
8d419f |
test/units/testsuite-64.service | 2 --
|
|
|
8d419f |
test/units/testsuite-71.service | 2 --
|
|
|
8d419f |
test/units/testsuite-73.service | 2 --
|
|
|
8d419f |
7 files changed, 12 insertions(+), 12 deletions(-)
|
|
|
8d419f |
|
|
|
8d419f |
diff --git a/test/test-functions b/test/test-functions
|
|
|
8d419f |
index 57d4df3e7e..77d4a0afff 100644
|
|
|
8d419f |
--- a/test/test-functions
|
|
|
8d419f |
+++ b/test/test-functions
|
|
|
8d419f |
@@ -2867,6 +2867,18 @@ test_setup() {
|
|
|
8d419f |
mask_supporting_services
|
|
|
8d419f |
fi
|
|
|
8d419f |
|
|
|
8d419f |
+ # Send stdout/stderr of testsuite-*.service units to both journal and
|
|
|
8d419f |
+ # console to make debugging in CIs easier
|
|
|
8d419f |
+ # Note: we can't use a dropin for `testsuite-.service`, since that also
|
|
|
8d419f |
+ # overrides 'sub-units' of some tests that already use a specific
|
|
|
8d419f |
+ # value for Standard(Output|Error)=
|
|
|
8d419f |
+ # (e.g. test/units/testsuite-66-deviceisolation.service)
|
|
|
8d419f |
+ if ! get_bool "$INTERACTIVE_DEBUG"; then
|
|
|
8d419f |
+ local dropin_dir="${initdir:?}/etc/systemd/system/testsuite-${TESTID:?}.service.d"
|
|
|
8d419f |
+ mkdir -p "$dropin_dir"
|
|
|
8d419f |
+ printf '[Service]\nStandardOutput=journal+console\nStandardError=journal+console' >"$dropin_dir/99-stdout.conf"
|
|
|
8d419f |
+ fi
|
|
|
8d419f |
+
|
|
|
8d419f |
if get_bool "$hook_defined"; then
|
|
|
8d419f |
test_append_files "${initdir:?}"
|
|
|
8d419f |
fi
|
|
|
8d419f |
diff --git a/test/units/testsuite-22.service b/test/units/testsuite-22.service
|
|
|
8d419f |
index b9ecc4c5d6..a5ed660c62 100644
|
|
|
8d419f |
--- a/test/units/testsuite-22.service
|
|
|
8d419f |
+++ b/test/units/testsuite-22.service
|
|
|
8d419f |
@@ -9,5 +9,3 @@ Wants=getty-pre.target
|
|
|
8d419f |
ExecStartPre=rm -f /failed /testok
|
|
|
8d419f |
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
|
|
|
8d419f |
Type=oneshot
|
|
|
8d419f |
-StandardOutput=tty
|
|
|
8d419f |
-StandardError=tty
|
|
|
8d419f |
diff --git a/test/units/testsuite-35.service b/test/units/testsuite-35.service
|
|
|
8d419f |
index 556a57a384..0599f6104e 100644
|
|
|
8d419f |
--- a/test/units/testsuite-35.service
|
|
|
8d419f |
+++ b/test/units/testsuite-35.service
|
|
|
8d419f |
@@ -5,6 +5,4 @@ Description=TEST-35-LOGIN
|
|
|
8d419f |
[Service]
|
|
|
8d419f |
ExecStartPre=rm -f /failed /testok
|
|
|
8d419f |
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
|
|
|
8d419f |
-StandardOutput=journal+console
|
|
|
8d419f |
-StandardError=journal+console
|
|
|
8d419f |
Type=oneshot
|
|
|
8d419f |
diff --git a/test/units/testsuite-45.service b/test/units/testsuite-45.service
|
|
|
8d419f |
index 79c0a6f117..b16ce9933f 100644
|
|
|
8d419f |
--- a/test/units/testsuite-45.service
|
|
|
8d419f |
+++ b/test/units/testsuite-45.service
|
|
|
8d419f |
@@ -5,6 +5,4 @@ Description=TEST-45-TIMEDATE
|
|
|
8d419f |
[Service]
|
|
|
8d419f |
ExecStartPre=rm -f /failed /testok
|
|
|
8d419f |
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
|
|
|
8d419f |
-StandardOutput=journal+console
|
|
|
8d419f |
-StandardError=journal+console
|
|
|
8d419f |
Type=oneshot
|
|
|
8d419f |
diff --git a/test/units/testsuite-64.service b/test/units/testsuite-64.service
|
|
|
8d419f |
index 10b61e7e53..f75a3d7aad 100644
|
|
|
8d419f |
--- a/test/units/testsuite-64.service
|
|
|
8d419f |
+++ b/test/units/testsuite-64.service
|
|
|
8d419f |
@@ -6,5 +6,3 @@ Description=TEST-64-UDEV
|
|
|
8d419f |
ExecStartPre=rm -f /failed /testok
|
|
|
8d419f |
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
|
|
|
8d419f |
Type=oneshot
|
|
|
8d419f |
-StandardOutput=journal+console
|
|
|
8d419f |
-StandardError=journal+console
|
|
|
8d419f |
diff --git a/test/units/testsuite-71.service b/test/units/testsuite-71.service
|
|
|
8d419f |
index 019e8bff24..1718629c05 100644
|
|
|
8d419f |
--- a/test/units/testsuite-71.service
|
|
|
8d419f |
+++ b/test/units/testsuite-71.service
|
|
|
8d419f |
@@ -5,6 +5,4 @@ Description=TEST-71-HOSTNAME
|
|
|
8d419f |
[Service]
|
|
|
8d419f |
ExecStartPre=rm -f /failed /testok
|
|
|
8d419f |
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
|
|
|
8d419f |
-StandardOutput=journal+console
|
|
|
8d419f |
-StandardError=journal+console
|
|
|
8d419f |
Type=oneshot
|
|
|
8d419f |
diff --git a/test/units/testsuite-73.service b/test/units/testsuite-73.service
|
|
|
8d419f |
index bee8c4215d..3ebd24da18 100644
|
|
|
8d419f |
--- a/test/units/testsuite-73.service
|
|
|
8d419f |
+++ b/test/units/testsuite-73.service
|
|
|
8d419f |
@@ -5,6 +5,4 @@ Description=TEST-73-LOCALE
|
|
|
8d419f |
[Service]
|
|
|
8d419f |
ExecStartPre=rm -f /failed /testok
|
|
|
8d419f |
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
|
|
|
8d419f |
-StandardOutput=journal+console
|
|
|
8d419f |
-StandardError=journal+console
|
|
|
8d419f |
Type=oneshot
|