From: Peter Rosin <peda@lysator.liu.se>
Date: Wed, 29 May 2013 14:53:55 +0000 (+0200)
Subject: tests: avoid a spurious failure on MSYS
X-Git-Tag: v1.13.2b~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=625678d54b616bf5c2db6c803f4b0746f70e3e53;p=thirdparty%2Fautomake.git

tests: avoid a spurious failure on MSYS

Fixes automake bug#14493.

* t/cxx-demo.sh: Strip CR characters from the program output.

Signed-off-by: Peter Rosin <peda@lysator.liu.se>
---

diff --git a/t/cxx-demo.sh b/t/cxx-demo.sh
index f6d568d78..f872c43e2 100644
--- a/t/cxx-demo.sh
+++ b/t/cxx-demo.sh
@@ -165,7 +165,8 @@ END
     Good morning, work.
 END
   for p in play work; do
-    ./$p > got.$p || { cat got.$p; exit 1; }
+    # Strip CR characters catering to MinGW programs on MSYS.
+    ./$p | tr -d '\015' > got.$p || { cat got.$p; exit 1; }
     cat exp.$p
     cat got.$p
     diff exp.$p got.$p