]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: suppress echo in monitor_check_rr()
authorYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 15 Dec 2022 06:28:56 +0000 (15:28 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 15 Dec 2022 12:50:13 +0000 (21:50 +0900)
test/units/testsuite-75.sh

index d2062c7b059514844f0ee55a4ed6c83061b9b2e6..d0c71334125fc85cac7928bfa368dd2d4a36a0e6 100755 (executable)
@@ -16,17 +16,17 @@ run() {
     "$@" |& tee "$RUN_OUT"
 }
 
-monitor_check_rr() {
+monitor_check_rr() (
+    set +x
+    set +o pipefail
     local match="${1:?}"
 
     # Wait until the first mention of the specified log message is
     # displayed. We turn off pipefail for this, since we don't care about the
     # lhs of this pipe expression, we only care about the rhs' result to be
     # clean
-    set +o pipefail
     journalctl -u resmontest.service -f --full | grep -m1 "$match"
-    set -o pipefail
-}
+)
 
 # Test for resolvectl, resolvconf
 systemctl unmask systemd-resolved.service