summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2012-07-24 22:56:01 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2012-07-24 22:56:01 +0200
commitfd2524171194ab00e7f7cad768bd6753a38ecab9 (patch)
treecf2c60f415d498bc6f02b7556937fc274bcd4785
parent15fa9fba94f55e8aa5508d23d23413d04a2ffe79 (diff)
downloadautomake-fd2524171194ab00e7f7cad768bd6753a38ecab9.tar.gz
tests: avoid non-textual output in a '.log' file
* t/dist-formats.tap: Here. Otherwise, some inferior awk implementations, like OpenIndiana /usr/xpg4/bin/awk, could be confused and cause spurious errors in the testsuite harness. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
-rwxr-xr-xt/dist-formats.tap9
1 files changed, 8 insertions, 1 deletions
diff --git a/t/dist-formats.tap b/t/dist-formats.tap
index 84f4edab8..85021d38c 100755
--- a/t/dist-formats.tap
+++ b/t/dist-formats.tap
@@ -88,9 +88,16 @@ have_compressor ()
return 1
;;
*)
+ case $1 in
+ # Do not use --version, or older versions bzip2 would try to
+ # compress stdin. This would cause binary output in the test
+ # logs, with potential breakage of our testsuite harness.
+ bzip2) o=--help;;
+ *) o=--version;;
+ esac
# Redirect to stderr to avoid polluting the output, in case this
# function is used in a command substitution (as it is, below).
- if $1 --version </dev/null >&2; then
+ if $1 $o </dev/null >&2; then
return 0
else
return 1