From 23d025fefa14a3815f8b804725acfd5622d3a4ac Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Thu, 20 Aug 2009 15:21:27 +0200 Subject: [PATCH] exclude-tests: Handle Windows EOL. --- ChangeLog | 10 ++++++++++ tests/test-exclude1.sh | 4 +++- tests/test-exclude2.sh | 4 +++- tests/test-exclude3.sh | 4 +++- tests/test-exclude4.sh | 4 +++- tests/test-exclude5.sh | 4 +++- tests/test-exclude6.sh | 4 +++- tests/test-exclude7.sh | 6 ++++-- 8 files changed, 32 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index b89a48315a..d50fcb0878 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2009-08-20 Simon Josefsson + + * 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 bootstrap: find sha1sum when named gsha1sum. diff --git a/tests/test-exclude1.sh b/tests/test-exclude1.sh index 9b9d3a15ce..ee1a148f2f 100755 --- 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 37cef71966..62228262df 100755 --- 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 dad433cba9..2cbd106add 100755 --- 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 cc0e06421c..b818a09e13 100755 --- a/tests/test-exclude4.sh +++ b/tests/test-exclude4.sh @@ -32,7 +32,9 @@ cat > $TMP <$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 -- 2.30.2