diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-07-10 15:29:57 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-07-10 16:06:10 +0200 |
commit | 65e7ac8c3556d1895ee597811856710143cfc4ac (patch) | |
tree | a3b8e42b290d23d09bd833b09de42389aa428372 /t/suffix10.tap | |
parent | cf80959825ac3b18271d0c15ce7345e64410c2f0 (diff) | |
download | automake-65e7ac8c3556d1895ee597811856710143cfc4ac.tar.gz |
tests: avoid spurious TAP errors on Mac OS X 10.7
Fixes automake bug#1897. Reported by Max Horn.
* t/suffix8.tap: The libtool bug#11895 was causing the ./configure script
to output a stray "ok" string on a line of its own, confusing the TAP
driver into thinking this was an extra test result (which resulted in the
next, real test results being flagged as "OUT-OF-ORDER"). Fix this by
protecting configure output.
* t/suffix10.tap: Likewise, and for the "make distcheck" output as well.
* THANKS: Update.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/suffix10.tap')
-rwxr-xr-x | t/suffix10.tap | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/t/suffix10.tap b/t/suffix10.tap index a65092415..7e19e0405 100755 --- a/t/suffix10.tap +++ b/t/suffix10.tap @@ -57,11 +57,22 @@ cat > foo.x_ << 'END' int foo (void) { return yyparse(); } END +# We must protect the TAP driver from the output of configure, since +# that might output a stray "ok" on a line of its own (due to a +# libtool bug on Mac OS X), thus causing a spurious test result to +# be seen. See automake bug#11897. +run_configure () +{ + st=0; ./configure >output 2>&1 || st=1 + sed 's/^/ /' output + test $st -eq 0 +} + command_ok_ "libtoolize" libtoolize --force command_ok_ "aclocal" $ACLOCAL command_ok_ "autoconf" $AUTOCONF command_ok_ "automake" $AUTOMAKE --add-missing -command_ok_ "configure" ./configure +command_ok_ "configure" run_configure command_ok_ "make test" $MAKE test directive=''; make_can_chain_suffix_rules || directive=TODO |