From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Fri, 7 Apr 2023 09:37:39 +0000 (+0200)
Subject: test: run the generators with debug log level
X-Git-Tag: v254-rc1~712^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=53c5dc5446a3a3fee3d54af3ab7a57f74341cebe;p=thirdparty%2Fsystemd.git

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 1973efefba9..8f502d00ccc 100644
--- 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 a9efc0bc7aa..b57a2c7d67b 100755
--- 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 63f4cb64307..13c767e490e 100755
--- 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"