[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.2-151-g06143bd

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=06143bdbbf8c3d358d51b646165634473c193afe

The branch, master has been updated
       via  06143bdbbf8c3d358d51b646165634473c193afe (commit)
       via  fd2524171194ab00e7f7cad768bd6753a38ecab9 (commit)
      from  e3e58b6c41c0df669129ba7988273b7b944ae56c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 06143bdbbf8c3d358d51b646165634473c193afe
Merge: e3e58b6 fd25241
Author: Stefano Lattarini <address@hidden>
Date:   Tue Jul 24 23:51:44 2012 +0200

    Merge branch 'maint'
    
    * maint:
      tests: avoid non-textual output in a '.log' file

-----------------------------------------------------------------------

Summary of changes:
 t/dist-formats.tap |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/t/dist-formats.tap b/t/dist-formats.tap
index 84f4eda..85021d3 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


hooks/post-receive
-- 
GNU Automake