From cce20dbeb6bea496c5bb750881e557dc7990f49f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 24 Jan 2020 10:57:47 -0800 Subject: [PATCH] scoutfs-tests: only check for new dmesg entries The dmesg check was creating false positives when unexpected messages from before the test run were forced out of the ring. The evicted messages were showing up as removals in the diff. We only want to see new messages that were created during the test run. So we format the diff to only output added lines. Signed-off-by: Zach Brown --- tests/run-tests.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/run-tests.sh b/tests/run-tests.sh index a2b858f5..885441c5 100755 --- a/tests/run-tests.sh +++ b/tests/run-tests.sh @@ -474,15 +474,17 @@ for t in $tests; do message=$(cat "$T_TMPDIR/status.msg") fi - # see if anything unexpected showed up in dmesg + # see if anything unexpected was added to dmesg if [ "$sts" == "$T_PASS_STATUS" ]; then dmesg | t_filter_dmesg > "$T_TMPDIR/dmesg.after" - diff -u "$T_TMPDIR/dmesg.before" "$T_TMPDIR/dmesg.after" > \ - "$T_TMPDIR/dmesg.diff" - if [ -s "$T_TMPDIR/dmesg.diff" ]; then + diff --old-line-format="" --unchanged-line-format="" \ + "$T_TMPDIR/dmesg.before" "$T_TMPDIR/dmesg.after" > \ + "$T_TMPDIR/dmesg.new" + + if [ -s "$T_TMPDIR/dmesg.new" ]; then message="unexpected messages in dmesg" sts=$T_FAIL_STATUS - cat "$T_TMPDIR/dmesg.diff" >> "$T_RESULTS/fail.log" + cat "$T_TMPDIR/dmesg.new" >> "$T_RESULTS/fail.log" fi fi