1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-21 18:03:41 +03:00

test: suppress echo in monitor_check_rr()

(cherry picked from commit ef09861a0b0aa7c6a948f4e008e2fea312bc68d6)
This commit is contained in:
Yu Watanabe 2022-12-15 15:28:56 +09:00 committed by Zbigniew Jędrzejewski-Szmek
parent a0ac79bce9
commit cb6a5a7cd1

View File

@ -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