1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-08 05:57:26 +03:00

test: suppress echo in monitor_check_rr()

This commit is contained in:
Yu Watanabe 2022-12-15 15:28:56 +09:00
parent 0969bb4246
commit ef09861a0b

View File

@ -16,17 +16,17 @@ run() {
"$@" |& tee "$RUN_OUT" "$@" |& tee "$RUN_OUT"
} }
monitor_check_rr() { monitor_check_rr() (
set +x
set +o pipefail
local match="${1:?}" local match="${1:?}"
# Wait until the first mention of the specified log message is # 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 # 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 # lhs of this pipe expression, we only care about the rhs' result to be
# clean # clean
set +o pipefail
journalctl -u resmontest.service -f --full | grep -m1 "$match" journalctl -u resmontest.service -f --full | grep -m1 "$match"
set -o pipefail )
}
# Test for resolvectl, resolvconf # Test for resolvectl, resolvconf
systemctl unmask systemd-resolved.service systemctl unmask systemd-resolved.service