From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 7 Sep 2011 14:35:17 +0000 (+0200)
Subject: test defs: fix glitch in TAP version of `warn_' function
X-Git-Tag: ng-0.5a~89^2~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e276f34ea4256d27d59f78e6d13c45892a6d182;p=thirdparty%2Fautomake.git

test defs: fix glitch in TAP version of `warn_' function

* tests/tap-functions.sh (warn_): Do not display the warning
message two times.
---

diff --git a/ChangeLog b/ChangeLog
index 79879cac2..9759787c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	test defs: fix glitch in TAP version of `warn_' function
+	* tests/tap-functions.sh (warn_): Do not display the warning
+	message two times.
+
 2011-09-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	tests: fix another spurious failure due to ignored signals
diff --git a/tests/tap-functions.sh b/tests/tap-functions.sh
index ea88887ae..eb27ba605 100644
--- a/tests/tap-functions.sh
+++ b/tests/tap-functions.sh
@@ -97,7 +97,10 @@ diag_string_="#"
 # Give a warning (using TAP diagnostic).
 warn_ ()
 {
-  diag_ "WARNING:" ${1-"(unknown warning)"} ${1+"$@"}
+  case $# in
+    0) diag_ "WARNING: (unknown warning)";;
+    *) diag_ "WARNING: $*";;
+  esac
 }
 
 # result_ RESULT [-D DIRECTIVE] [-r REASON] [--] [DESCRIPTION...]