exclude-tests: Handle Windows EOL.

diff --git a/ChangeLog b/ChangeLog
index b89a483..d50fcb0 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 9b9d3a1..ee1a148 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 37cef71..6222826 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 dad433c..2cbd106 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 cc0e064..b818a09 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 0d71788..b91cbfa 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 9555809..f0a41cc 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 95dc9fb..60b25c0 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