summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorPeter Rosin <peda@lysator.liu.se>2013-05-29 16:53:55 +0200
committerPeter Rosin <peda@lysator.liu.se>2013-05-29 16:53:55 +0200
commit625678d54b616bf5c2db6c803f4b0746f70e3e53 (patch)
tree523b6a59c7db7e65191ffbffc5cf5a22a3fc1ade /t
parenteefd01b3fb3f233bcaffdd0aedc611dd819634aa (diff)
downloadautomake-625678d54b616bf5c2db6c803f4b0746f70e3e53.tar.gz
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>
Diffstat (limited to 't')
-rw-r--r--t/cxx-demo.sh3
1 files changed, 2 insertions, 1 deletions
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