From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 24 Jul 2012 20:56:01 +0000 (+0200)
Subject: tests: avoid non-textual output in a '.log' file
X-Git-Tag: v1.12.3~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd2524171194ab00e7f7cad768bd6753a38ecab9;p=thirdparty%2Fautomake.git

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

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