diff options
author | Frantisek Sumsal <frantisek@sumsal.cz> | 2023-04-07 11:37:39 +0200 |
---|---|---|
committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2023-04-14 10:45:20 +0200 |
commit | 53c5dc5446a3a3fee3d54af3ab7a57f74341cebe (patch) | |
tree | 4c4177273aba1ea018421bfdae5b405fffb0e8e7 | |
parent | systemd-confext: mount confexts as noexec and nosuid (diff) | |
download | systemd-53c5dc5446a3a3fee3d54af3ab7a57f74341cebe.tar.xz systemd-53c5dc5446a3a3fee3d54af3ab7a57f74341cebe.zip |
test: run the generators with debug log level
unless requested otherwise.
-rw-r--r-- | test/units/generator-utils.sh | 2 | ||||
-rwxr-xr-x | test/units/testsuite-81.fstab-generator.sh | 2 | ||||
-rwxr-xr-x | test/units/testsuite-81.sh | 2 |
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" |