summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorFrantisek Sumsal <frantisek@sumsal.cz>2023-04-07 11:37:39 +0200
committerFrantisek Sumsal <frantisek@sumsal.cz>2023-04-14 10:45:20 +0200
commit53c5dc5446a3a3fee3d54af3ab7a57f74341cebe (patch)
tree4c4177273aba1ea018421bfdae5b405fffb0e8e7 /test
parent0607a9f9da628deed420a811852d3b506a0efc2d (diff)
downloadsystemd-53c5dc5446a3a3fee3d54af3ab7a57f74341cebe.tar.gz
test: run the generators with debug log level
unless requested otherwise.
Diffstat (limited to 'test')
-rw-r--r--test/units/generator-utils.sh2
-rwxr-xr-xtest/units/testsuite-81.fstab-generator.sh2
-rwxr-xr-xtest/units/testsuite-81.sh2
3 files changed, 1 insertions, 5 deletions
diff --git a/test/units/generator-utils.sh b/test/units/generator-utils.sh
index 1973efefba..8f502d00cc 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 a9efc0bc7a..b57a2c7d67 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 63f4cb6430..13c767e490 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"