From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 13 Feb 2012 23:14:36 +0000 (+0100)
Subject: tests: avoid yet other spurious failures on NetBSD
X-Git-Tag: ng-0.5a~9^2~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79b2c6a58577662070f8f8827f5e6f665ebd102a;p=thirdparty%2Fautomake.git

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

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 \