Mercurial > hg > octave-lojdl > gnulib-hg

changeset 11855:e53ecd6bb7d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
exclude-tests: Handle Windows EOL.
author Simon Josefsson <simon@josefsson.org>
date Thu, 20 Aug 2009 15:21:27 +0200
parents e11202dcc2b8
children 8b0d11ca9d01
files ChangeLog tests/test-exclude1.sh tests/test-exclude2.sh tests/test-exclude3.sh tests/test-exclude4.sh tests/test-exclude5.sh tests/test-exclude6.sh tests/test-exclude7.sh
diffstat 8 files changed, 32 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- a/tests/test-exclude1.sh
+++ b/tests/test-exclude1.sh
@@ -37,7 +37,9 @@
 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
--- a/tests/test-exclude2.sh
+++ b/tests/test-exclude2.sh
@@ -37,7 +37,9 @@
 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
--- a/tests/test-exclude3.sh
+++ b/tests/test-exclude3.sh
@@ -37,7 +37,9 @@
 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
--- a/tests/test-exclude4.sh
+++ b/tests/test-exclude4.sh
@@ -32,7 +32,9 @@
 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
--- a/tests/test-exclude5.sh
+++ b/tests/test-exclude5.sh
@@ -35,7 +35,9 @@
 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
--- a/tests/test-exclude6.sh
+++ b/tests/test-exclude6.sh
@@ -33,7 +33,9 @@
 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
--- a/tests/test-exclude7.sh
+++ b/tests/test-exclude7.sh
@@ -33,8 +33,10 @@
 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