test: run the generators with debug log level

unless requested otherwise.

diff --git a/test/units/generator-utils.sh b/test/units/generator-utils.sh
index 1973efefba92c98595d6252935d491e3cbd53d76..8f502d00ccc30c48ea16c3879f1126fb34ad19c8 100644 (file)
--- a/test/units/generator-utils.sh
+++ b/test/units/generator-utils.sh
@@ -56,6 +56,6 @@ run_and_list() {
     local out_dir="${2:?}"
 
     rm -fr "${out_dir:?}"/*
-    "$generator" "$out_dir"
+    SYSTEMD_LOG_LEVEL="${SYSTEMD_LOG_LEVEL:-debug}" "$generator" "$out_dir"
     ls -lR "$out_dir"
 }

diff --git a/test/units/testsuite-81.fstab-generator.sh b/test/units/testsuite-81.fstab-generator.sh
index a9efc0bc7aa0d9a1fb7480be3d39921490444f9e..b57a2c7d67b26c44ac2b124dbd5488f052528978 100755 (executable)
--- a/test/units/testsuite-81.fstab-generator.sh
+++ b/test/units/testsuite-81.fstab-generator.sh
@@ -7,8 +7,6 @@ set -o pipefail
 # shellcheck source=test/units/generator-utils.sh
 . "$(dirname "$0")/generator-utils.sh"
 
-export SYSTEMD_LOG_LEVEL=debug
-
 GENERATOR_BIN="/usr/lib/systemd/system-generators/systemd-fstab-generator"
 NETWORK_FS_RX="^(afs|ceph|cifs|gfs|gfs2|ncp|ncpfs|nfs|nfs4|ocfs2|orangefs|pvfs2|smb3|smbfs|davfs|glusterfs|lustre|sshfs)$"
 OUT_DIR="$(mktemp -d /tmp/fstab-generator.XXX)"

diff --git a/test/units/testsuite-81.sh b/test/units/testsuite-81.sh
index 63f4cb64307ec2ad81faa09b46cb27383b8c3f9a..13c767e490e96182a0481745e269ee4068769bd1 100755 (executable)
--- a/test/units/testsuite-81.sh
+++ b/test/units/testsuite-81.sh
@@ -5,8 +5,6 @@ set -o pipefail
 
 : >/failed
 
-systemctl log-level debug
-
 for script in "${0%.sh}".*.sh; do
     echo "Running $script"
     "./$script"