From fd2524171194ab00e7f7cad768bd6753a38ecab9 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Tue, 24 Jul 2012 22:56:01 +0200 Subject: [PATCH] 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 --- t/dist-formats.tap | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 &2; then + if $1 $o &2; then return 0 else return 1 -- 2.7.4