From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 6 Aug 2011 15:42:38 +0000 (+0200)
Subject: tap: fix whitespace munging of diagnostic messages
X-Git-Tag: ng-0.5a~89^2~142^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a792eb24810033314f675b4e65efbdd9348b706;p=thirdparty%2Fautomake.git

tap: fix whitespace munging of diagnostic messages

* lib/tap-driver (extract_tap_comment): Pass the `g' flag to the
substitution operator, to strip also trailing whitespaces.  Fixes
a failure in test `tap-whitespace-normalization.test'.
---

diff --git a/ChangeLog b/ChangeLog
index b44766c6b..e07ef47ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	tap: fix whitespace munging of diagnostic messages
+	* lib/tap-driver (extract_tap_comment): Pass the `g' flag to the
+	substitution operator, to strip also trailing whitespaces.  Fixes
+	a failure in test `tap-whitespace-normalization.test'.
+
 2011-08-05  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	tap: fix typo in TAP driver version message
diff --git a/lib/tap-driver b/lib/tap-driver
index 91edd1e05..d59ae01ea 100755
--- a/lib/tap-driver
+++ b/lib/tap-driver
@@ -356,7 +356,7 @@ sub extract_tap_comment ($)
   local $_ = shift;
   if (/^\Q$diag_string\E(.*)$/o)
     {
-      (my $comment = $1) =~ s/(?:^\s*|\s*$)//;
+      (my $comment = $1) =~ s/(?:^\s*|\s*$)//g;
       return $comment;
     }
   return "";