From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 25 Nov 2017 15:01:55 +0000 (+0900)
Subject: test: set log_level to info in test-hwdb and check-help-*
X-Git-Tag: v236~114^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=07b3a026433d52deb3d7fd079e0dc13416b364b3;p=thirdparty%2Fsystemd.git

test: set log_level to info in test-hwdb and check-help-*

These tests check the stderr. So, if the systemd.log_level=debug
is set in the kernel command line, then these tests fail.
This set log_level to info in hwdb-test.sh and meson-check-help.sh,
the kernel command line not to change the output of the target
programs.

Fixes #7362.
---

diff --git a/test/hwdb-test.sh b/test/hwdb-test.sh
index 68c7692ecad..a1f3270b64d 100755
--- a/test/hwdb-test.sh
+++ b/test/hwdb-test.sh
@@ -22,6 +22,7 @@
 
 set -e
 
+export SYSTEMD_LOG_LEVEL=info
 ROOTDIR=$(dirname $(dirname $(readlink -f $0)))
 SYSTEMD_HWDB=./systemd-hwdb
 
diff --git a/tools/meson-check-help.sh b/tools/meson-check-help.sh
index 47a5099a04c..4210491a987 100755
--- a/tools/meson-check-help.sh
+++ b/tools/meson-check-help.sh
@@ -1,5 +1,7 @@
 #!/bin/sh -eu
 
+export SYSTEMD_LOG_LEVEL=info
+
 # output width
 if "$1"  --help | grep -v 'default:' | grep -E -q '.{80}.'; then
         echo "$(basename "$1") --help output is too wide:"