test: don't flush debug logs to the console

Let's keep the debug logs in the journal, while logging only
testsute-*.sh stdout/stderr to the console (ba7abf7). This should make
the test output log a bit more readable and potentially the tests itself
a bit faster by avoiding console oversaturation.

Also, it should significantly reduce the size of artifacts kept by CIs.

diff --git a/test/units/testsuite-20.sh b/test/units/testsuite-20.sh
index fc87c18c4c1e4e4249caceaba3540d7c0bcca5ba..338769aacc500902d49ab7660e18592d87222bbc 100755 (executable)
--- a/test/units/testsuite-20.sh
+++ b/test/units/testsuite-20.sh
@@ -4,7 +4,6 @@ set -eux
 set -o pipefail
 
 systemd-analyze log-level debug
-systemd-analyze log-target console
 
 test "$(systemctl show -P MainPID testsuite-20.service)" -eq $$
 

diff --git a/test/units/testsuite-23.sh b/test/units/testsuite-23.sh
index 46e45c8780d6b9eebf144d0500dd5b5a426f4d3b..e8f99ff60d0de2d7852bd6e7d09ad0e37a784bd7 100755 (executable)
--- a/test/units/testsuite-23.sh
+++ b/test/units/testsuite-23.sh
@@ -4,7 +4,6 @@ set -eux
 set -o pipefail
 
 systemd-analyze log-level debug
-systemd-analyze log-target console
 
 # Create a binary for which execve() will fail
 touch /tmp/brokenbinary

diff --git a/test/units/testsuite-27.sh b/test/units/testsuite-27.sh
index 3b2f9251539f313a60bc8d3adeb794147c592e23..c0701f35c30d5bba7131acc3c24631d13dca465c 100755 (executable)
--- a/test/units/testsuite-27.sh
+++ b/test/units/testsuite-27.sh
@@ -4,7 +4,6 @@ set -eux
 set -o pipefail
 
 systemd-analyze log-level debug
-systemd-analyze log-target console
 
 systemd-run --wait --unit=test27-one \
             -p StandardOutput=file:/tmp/stdout \

diff --git a/test/units/testsuite-30.sh b/test/units/testsuite-30.sh
index 51b9bdd09311b7ec6609a7c473ff9129f76646ae..57f46669f9e72850cffaf96158d248bef7544836 100755 (executable)
--- a/test/units/testsuite-30.sh
+++ b/test/units/testsuite-30.sh
@@ -4,7 +4,6 @@ set -eux
 set -o pipefail
 
 systemd-analyze log-level debug
-systemd-analyze log-target console
 
 systemctl disable --now systemd-timesyncd.service
 

diff --git a/test/units/testsuite-32.sh b/test/units/testsuite-32.sh
index 20ab67f6f111cb9c063dd58e1e66f0cd8e1ad2c4..5c289d0abfbe9d401f62c9123fee214c70f29acd 100755 (executable)
--- a/test/units/testsuite-32.sh
+++ b/test/units/testsuite-32.sh
@@ -11,7 +11,6 @@ set -o pipefail
 
 if test -f /sys/fs/cgroup/system.slice/testsuite-32.service/memory.oom.group; then
     systemd-analyze log-level debug
-    systemd-analyze log-target console
 
     # Run a service that is guaranteed to be the first candidate for OOM killing
     systemd-run --unit=oomtest.service \

diff --git a/test/units/testsuite-34.sh b/test/units/testsuite-34.sh
index 57a7b950a01cfff1a6c53bbad0886663a19c6ea6..e6171beaa6205b6743613f530aaae39d6a914334 100755 (executable)
--- a/test/units/testsuite-34.sh
+++ b/test/units/testsuite-34.sh
@@ -4,7 +4,6 @@ set -eux
 set -o pipefail
 
 systemd-analyze log-level debug
-systemd-analyze log-target console
 
 function test_directory() {
     local directory="$1"

diff --git a/test/units/testsuite-38.sh b/test/units/testsuite-38.sh
index f2f61b961f5239b97050b27d9c2b45efa2a23643..438990d1c523ea77d368f8bbbb3db472b083f22a 100755 (executable)
--- a/test/units/testsuite-38.sh
+++ b/test/units/testsuite-38.sh
@@ -5,7 +5,6 @@ set -eux
 set -o pipefail
 
 systemd-analyze log-level debug
-systemd-analyze log-target console
 
 unit=testsuite-38-sleep.service
 

diff --git a/test/units/testsuite-39.sh b/test/units/testsuite-39.sh
index 03abf391f1d007e57921e28f53e76460edcd52e0..5b77bbbaf173ae0c4e156635b07ef4f8bc66af85 100755 (executable)
--- a/test/units/testsuite-39.sh
+++ b/test/units/testsuite-39.sh
@@ -4,7 +4,6 @@ set -eux
 set -o pipefail
 
 systemd-analyze log-level debug
-systemd-analyze log-target console
 
 export SYSTEMD_PAGER=
 SERVICE_PATH="$(mktemp /etc/systemd/system/execreloadXXX.service)"

diff --git a/test/units/testsuite-40.sh b/test/units/testsuite-40.sh
index dd54fa174cee3c354d02063bf56f60a2499c8c1f..cec1fd3a7aa41f211b2d347dfe9d4e42d2965045 100755 (executable)
--- a/test/units/testsuite-40.sh
+++ b/test/units/testsuite-40.sh
@@ -4,7 +4,6 @@ set -eux
 set -o pipefail
 
 systemd-analyze log-level debug
-systemd-analyze log-target console
 
 declare -A property
 

diff --git a/test/units/testsuite-41.sh b/test/units/testsuite-41.sh
index 3b41db03f58d59975dce6d72468bee7df824b7e2..13bc684c2d1ba3a0d52d25694ea14a3bc89b4951 100755 (executable)
--- a/test/units/testsuite-41.sh
+++ b/test/units/testsuite-41.sh
@@ -7,7 +7,6 @@ set -o pipefail
 MAX_SECS=60
 
 systemd-analyze log-level debug
-systemd-analyze log-target console
 
 # test one: Restart=on-failure should restart the service
 systemd-run --unit=one -p Type=oneshot -p Restart=on-failure /bin/bash -c "exit 1" \

diff --git a/test/units/testsuite-46.sh b/test/units/testsuite-46.sh
index 82da3b755caff1061325f1a45ac068a169f2303c..9d090654bc1f0cdc0123371d04c285864ca9cad0 100755 (executable)
--- a/test/units/testsuite-46.sh
+++ b/test/units/testsuite-46.sh
@@ -34,7 +34,6 @@ wait_for_state() {
 }
 
 systemd-analyze log-level debug
-systemd-analyze log-target console
 systemctl service-log-level systemd-homed debug
 
 # Create a tmpfs to use as backing store for the home dir. That way we can enforce a size limit nicely.

diff --git a/test/units/testsuite-47.sh b/test/units/testsuite-47.sh
index ff10602df79295ef315b32a065de19434aa04a2d..529e9617a58a85d4a8eec42f744b4cd83183bfe1 100755 (executable)
--- a/test/units/testsuite-47.sh
+++ b/test/units/testsuite-47.sh
@@ -4,7 +4,6 @@ set -eux
 set -o pipefail
 
 systemd-analyze log-level debug
-systemd-analyze log-target console
 
 systemctl start testsuite-47-repro
 sleep 4

diff --git a/test/units/testsuite-52.sh b/test/units/testsuite-52.sh
index 8a76ff6ed6db273aa55d5506fbd8b12e808f0e19..d78fdd53bac9d8cb32f67a5111f79640cbab9d0b 100755 (executable)
--- a/test/units/testsuite-52.sh
+++ b/test/units/testsuite-52.sh
@@ -4,7 +4,6 @@ set -ex
 set -o pipefail
 
 systemd-analyze log-level debug
-systemd-analyze log-target console
 
 systemctl enable test-honor-first-shutdown.service
 systemctl start test-honor-first-shutdown.service

diff --git a/test/units/testsuite-55.sh b/test/units/testsuite-55.sh
index 009933e6654c9419c88bb067a369cd239534988f..8fa1d01fd06f1234ec6ecee33737042da9a5d588 100755 (executable)
--- a/test/units/testsuite-55.sh
+++ b/test/units/testsuite-55.sh
@@ -4,7 +4,6 @@ set -eux
 set -o pipefail
 
 systemd-analyze log-level debug
-systemd-analyze log-target console
 
 # Loose checks to ensure the environment has the necessary features for systemd-oomd
 [[ -e /proc/pressure ]] || echo "no PSI" >>/skipped

diff --git a/test/units/testsuite-59.sh b/test/units/testsuite-59.sh
index 143e44ec6373aebcd4ba079b8f66f16d967e63f9..83db0531072ca6f58aa8c1fbacea9a682e045877 100755 (executable)
--- a/test/units/testsuite-59.sh
+++ b/test/units/testsuite-59.sh
@@ -28,7 +28,6 @@ wait_on_state_or_fail () {
 }
 
 systemd-analyze log-level debug
-systemd-analyze log-target console
 
 
 cat >/run/systemd/system/testservice-fail-59.service <<EOF

diff --git a/test/units/testsuite-62.sh b/test/units/testsuite-62.sh
index da40c2f1e7973c9549574ae88cbf8ebed521f17f..04b79b7e774bcf52800a315f6b158d46bff96e1f 100755 (executable)
--- a/test/units/testsuite-62.sh
+++ b/test/units/testsuite-62.sh
@@ -5,7 +5,6 @@ set -o pipefail
 
 setup() {
     systemd-analyze log-level debug
-    systemd-analyze log-target console
 
     for i in {0..3};
     do

diff --git a/test/units/testsuite-66.sh b/test/units/testsuite-66.sh
index fba42d15df73adf3a5f2f8bf45504816889b868d..7a88e5bcba04de7d51b50dbaebc93b98e49297f6 100755 (executable)
--- a/test/units/testsuite-66.sh
+++ b/test/units/testsuite-66.sh
@@ -6,7 +6,6 @@ set -o pipefail
 RESULTS_FILE=/tmp/testsuite66serviceresults
 
 systemd-analyze log-level debug
-systemd-analyze log-target console
 
 systemctl start testsuite-66-deviceisolation.service