From 79b2c6a58577662070f8f8827f5e6f665ebd102a Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Tue, 14 Feb 2012 00:14:36 +0100 Subject: [PATCH] tests: avoid yet other spurious failures on NetBSD * tests/tap-signal.tap: Add a "strategically placed" extra 'echo' command and a temporary silencing of xtraces; they are required to avoid possible garbled output with NetBSD make, which would miss some final newlines in the expected places and thus mess up our TAP output. --- tests/tap-signal.tap | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/tap-signal.tap b/tests/tap-signal.tap index f436bc88a..e14cc50c3 100755 --- a/tests/tap-signal.tap +++ b/tests/tap-signal.tap @@ -98,7 +98,15 @@ signal_caught () esac } -command_ok_ '"make check" fails' eval 'not $MAKE check >stdout' +command_ok_ '"make check" fails' eval ' + ( + st=0; $MAKE check >stdout || st=$? + # Extra "echo" and silencing of xtraces required to avoid possible + # garbled output with NetBSD make, which would miss some final + # newlines in the expected places and thus mess up our TAP output. + set +x; echo + ) +' cat stdout # For debugging. command_ok_ "count of test results" count_test_results \ -- 2.47.2