exclude-tests: Handle Windows EOL.

diff --git a/ChangeLog b/ChangeLog
index b89a48315a74a169ba9ee6e92f84afc00b4eef46..d50fcb087821a1e5ff6b0607179373d1feef79e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-08-20  Simon Josefsson  <simon@josefsson.org>
+
+       * tests/test-exclude1.sh: Handle Windows EOL.
+       * tests/test-exclude2.sh: Likewise.
+       * tests/test-exclude3.sh: Likewise.
+       * tests/test-exclude4.sh: Likewise.
+       * tests/test-exclude5.sh: Likewise.
+       * tests/test-exclude6.sh: Likewise.
+       * tests/test-exclude7.sh: Likewise.
+
 2009-08-19  Akim Demaille  <demaille@gostai.com>
 
        bootstrap: find sha1sum when named gsha1sum.

diff --git a/tests/test-exclude1.sh b/tests/test-exclude1.sh
index 9b9d3a15ce01b7944cd88919cf8c0121d4b5545f..ee1a148f2fd095c77b6aa5b1e260eb45272b122e 100755 (executable)
--- a/tests/test-exclude1.sh
+++ b/tests/test-exclude1.sh
@@ -37,7 +37,9 @@ baz: 0
 bar/qux: 0
 EOT
 
-./test-exclude$EXEEXT $LIST -- foo 'foo*' bar foobar baz bar/qux | diff -c $TMP - || ERR=1
+./test-exclude$EXEEXT $LIST -- foo 'foo*' bar foobar baz bar/qux |
+ tr -d '\015' |
+ diff -c $TMP - || ERR=1
 
 rm -f $TMP $LIST
 exit $ERR

diff --git a/tests/test-exclude2.sh b/tests/test-exclude2.sh
index 37cef719668d5175b24efef3dc53dd06ddb907a3..62228262df51c48bb91444397e0ad5b3ad7ebc38 100755 (executable)
--- a/tests/test-exclude2.sh
+++ b/tests/test-exclude2.sh
@@ -37,7 +37,9 @@ baz: 1
 bar/qux: 0
 EOT
 
-./test-exclude$EXEEXT -casefold $LIST -- foo 'foo*' bar foobar baz bar/qux| diff -c $TMP - || ERR=1
+./test-exclude$EXEEXT -casefold $LIST -- foo 'foo*' bar foobar baz bar/qux |
+ tr -d '\015' |
+ diff -c $TMP - || ERR=1
 
 rm -f $TMP $LIST
 exit $ERR

diff --git a/tests/test-exclude3.sh b/tests/test-exclude3.sh
index dad433cba98e881aa9219d67b0e31c0150b0ddc2..2cbd106add4f362ccb8a6d14866cdc27b352ae24 100755 (executable)
--- a/tests/test-exclude3.sh
+++ b/tests/test-exclude3.sh
@@ -37,7 +37,9 @@ baz: 1
 bar/qux: 1
 EOT
 
-./test-exclude$EXEEXT -include $LIST -- foo 'foo*' bar foobar baz bar/qux| diff -c $TMP - || ERR=1
+./test-exclude$EXEEXT -include $LIST -- foo 'foo*' bar foobar baz bar/qux |
+ tr -d '\015' |
+ diff -c $TMP - || ERR=1
 
 rm -f $TMP $LIST
 exit $ERR

diff --git a/tests/test-exclude4.sh b/tests/test-exclude4.sh
index cc0e06421cebd92b8e6b3bd79be042bc790958e3..b818a09e13f0d150f008b16531797a89adcc8716 100755 (executable)
--- a/tests/test-exclude4.sh
+++ b/tests/test-exclude4.sh
@@ -32,7 +32,9 @@ cat > $TMP <<EOT
 foobar: 1
 EOT
 
-./test-exclude$EXEEXT -wildcards $LIST -- foobar | diff -c $TMP - || ERR=1
+./test-exclude$EXEEXT -wildcards $LIST -- foobar |
+ tr -d '\015' |
+ diff -c $TMP - || ERR=1
 
 rm -f $TMP $LIST
 exit $ERR

diff --git a/tests/test-exclude5.sh b/tests/test-exclude5.sh
index 0d717886cb72c7f88f8950ccb6a4e3236d1c31f1..b91cbfa85af0df2efadba16c90aa7c4c190085f7 100755 (executable)
--- a/tests/test-exclude5.sh
+++ b/tests/test-exclude5.sh
@@ -35,7 +35,9 @@ barz: 0
 foo/bar: 1
 EOT
 
-./test-exclude$EXEEXT -leading_dir $LIST -- bar bar/qux barz foo/bar | diff -c $TMP - || ERR=1
+./test-exclude$EXEEXT -leading_dir $LIST -- bar bar/qux barz foo/bar |
+ tr -d '\015' |
+ diff -c $TMP - || ERR=1
 
 rm -f $TMP $LIST
 exit $ERR

diff --git a/tests/test-exclude6.sh b/tests/test-exclude6.sh
index 9555809fe183c76c5cd65d47c1b4a487b03ea3da..f0a41cc5854e0cdc9a4257f737ed3f1fd3112513 100755 (executable)
--- a/tests/test-exclude6.sh
+++ b/tests/test-exclude6.sh
@@ -33,7 +33,9 @@ bar: 1
 foo/bar: 0
 EOT
 
-./test-exclude$EXEEXT -anchored $LIST -- bar foo/bar | diff -c $TMP - || ERR=1
+./test-exclude$EXEEXT -anchored $LIST -- bar foo/bar |
+ tr -d '\015' |
+ diff -c $TMP - || ERR=1
 
 rm -f $TMP $LIST
 exit $ERR

diff --git a/tests/test-exclude7.sh b/tests/test-exclude7.sh
index 95dc9fbc321a2ffe338783b121640e939c77c9a5..60b25c07d51a0de4503668122dba1b611c106e4c 100755 (executable)
--- a/tests/test-exclude7.sh
+++ b/tests/test-exclude7.sh
@@ -33,8 +33,10 @@ bar: 1
 bar: 0
 EOT
 
-./test-exclude$EXEEXT $LIST -include $LIST -- bar >$TMP.1
-./test-exclude$EXEEXT -include $LIST -no-include $LIST -- bar >>$TMP.1
+./test-exclude$EXEEXT $LIST -include $LIST -- bar |
+ tr -d '\015' >$TMP.1
+./test-exclude$EXEEXT -include $LIST -no-include $LIST -- bar |
+ tr -d '\015' >>$TMP.1
 
 diff -c $TMP $TMP.1 || ERR=1