From: Jim Meyering Date: Sat, 12 Nov 2011 16:12:59 +0000 (+0100) Subject: revamp the other test-exclude?.sh scripts to use init.sh, too X-Git-Tag: v0.1~1445 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=293ba0481af81e296d922434983ebb23e79518e3;p=gnulib.git revamp the other test-exclude?.sh scripts to use init.sh, too * tests/test-exclude1.sh: Use init.sh. * 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. * tests/test-exclude8.sh: Likewise. * modules/exclude-tests (Files): List init.sh. --- diff --git a/ChangeLog b/ChangeLog index d265d7512..2794c4d4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2011-11-12 Jim Meyering + revamp the other test-exclude?.sh scripts to use init.sh, too + * tests/test-exclude1.sh: Use init.sh. + * 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. + * tests/test-exclude8.sh: Likewise. + * modules/exclude-tests (Files): List init.sh. + test-exclude2.sh, test-exclude5.sh: fail if test-exclude fails These shell scripts ignored failure of the binary test-exclude, so making the latter return 77 didn't cause them to be skipped. diff --git a/modules/exclude-tests b/modules/exclude-tests index 3dd02251a..072a4e6cd 100644 --- a/modules/exclude-tests +++ b/modules/exclude-tests @@ -1,4 +1,5 @@ Files: +tests/init.sh tests/test-exclude.c tests/test-exclude1.sh tests/test-exclude2.sh diff --git a/tests/test-exclude1.sh b/tests/test-exclude1.sh index 9c5f70958..d85c4c74b 100755 --- a/tests/test-exclude1.sh +++ b/tests/test-exclude1.sh @@ -16,19 +16,18 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -TMP=excltmp.$$ -LIST=flist.$$ -ERR=0 +. "${srcdir=.}/init.sh"; path_prepend_ . +fail=0 # Test literal matches -cat > $LIST < in < $TMP < expected < out || exit $? -rm -f $TMP $LIST -exit $ERR +# Find out how to remove carriage returns from output. Solaris /usr/ucb/tr +# does not understand '\r'. +case $(echo r | tr -d '\r') in '') cr='\015';; *) cr='\r';; esac + +# normalize output +LC_ALL=C tr -d "$cr" < out > k && mv k out + +compare expected out || fail=1 + +Exit $fail diff --git a/tests/test-exclude2.sh b/tests/test-exclude2.sh index b38bb7fdd..33ee734e1 100755 --- a/tests/test-exclude2.sh +++ b/tests/test-exclude2.sh @@ -17,7 +17,6 @@ # along with this program. If not, see . . "${srcdir=.}/init.sh"; path_prepend_ . - fail=0 cat > in < out \ - || exit $? +test-exclude -casefold in -- foo 'foo*' bar foobar baz bar/qux > out || exit $? # Find out how to remove carriage returns from output. Solaris /usr/ucb/tr # does not understand '\r'. case $(echo r | tr -d '\r') in '') cr='\015';; *) cr='\r';; esac # normalize output -LC_ALL=C tr -d "$cr" < out > k -mv k out +LC_ALL=C tr -d "$cr" < out > k && mv k out compare expected out || fail=1 diff --git a/tests/test-exclude3.sh b/tests/test-exclude3.sh index 6b8512efb..a9a4d2318 100755 --- a/tests/test-exclude3.sh +++ b/tests/test-exclude3.sh @@ -16,19 +16,18 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -TMP=excltmp.$$ -LIST=flist.$$ -ERR=0 +. "${srcdir=.}/init.sh"; path_prepend_ . +fail=0 # Test include -cat > $LIST < in < $TMP < expected < out || exit $? -rm -f $TMP $LIST -exit $ERR +# Find out how to remove carriage returns from output. Solaris /usr/ucb/tr +# does not understand '\r'. +case $(echo r | tr -d '\r') in '') cr='\015';; *) cr='\r';; esac + +# normalize output +LC_ALL=C tr -d "$cr" < out > k && mv k out + +compare expected out || fail=1 + +Exit $fail diff --git a/tests/test-exclude4.sh b/tests/test-exclude4.sh index 99c4c9fec..b3ecdae75 100755 --- a/tests/test-exclude4.sh +++ b/tests/test-exclude4.sh @@ -16,25 +16,30 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -TMP=excltmp.$$ -LIST=flist.$$ -ERR=0 +. "${srcdir=.}/init.sh"; path_prepend_ . +fail=0 # Test wildcard matching -cat > $LIST < in < $TMP < expected < out || exit $? -rm -f $TMP $LIST -exit $ERR +# Find out how to remove carriage returns from output. Solaris /usr/ucb/tr +# does not understand '\r'. +case $(echo r | tr -d '\r') in '') cr='\015';; *) cr='\r';; esac + +# normalize output +LC_ALL=C tr -d "$cr" < out > k && mv k out + +compare expected out || fail=1 + +Exit $fail diff --git a/tests/test-exclude5.sh b/tests/test-exclude5.sh index 32579637c..d9558f74e 100755 --- a/tests/test-exclude5.sh +++ b/tests/test-exclude5.sh @@ -17,7 +17,6 @@ # along with this program. If not, see . . "${srcdir=.}/init.sh"; path_prepend_ . - fail=0 # Test FNM_LEADING_DIR @@ -35,16 +34,14 @@ barz: 0 foo/bar: 1 EOT -test-exclude -leading_dir in -- bar bar/qux barz foo/bar > out \ - || exit $? +test-exclude -leading_dir in -- bar bar/qux barz foo/bar > out || exit $? # Find out how to remove carriage returns from output. Solaris /usr/ucb/tr # does not understand '\r'. case $(echo r | tr -d '\r') in '') cr='\015';; *) cr='\r';; esac # normalize output -LC_ALL=C tr -d "$cr" < out > k -mv k out +LC_ALL=C tr -d "$cr" < out > k && mv k out compare expected out || fail=1 diff --git a/tests/test-exclude6.sh b/tests/test-exclude6.sh index eb4f5f1eb..b2093d610 100755 --- a/tests/test-exclude6.sh +++ b/tests/test-exclude6.sh @@ -16,26 +16,31 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -TMP=excltmp.$$ -LIST=flist.$$ -ERR=0 +. "${srcdir=.}/init.sh"; path_prepend_ . +fail=0 # Test anchored -cat > $LIST < in < $TMP < expected < out || exit $? -rm -f $TMP $LIST -exit $ERR +# Find out how to remove carriage returns from output. Solaris /usr/ucb/tr +# does not understand '\r'. +case $(echo r | tr -d '\r') in '') cr='\015';; *) cr='\r';; esac + +# normalize output +LC_ALL=C tr -d "$cr" < out > k && mv k out + +compare expected out || fail=1 + +Exit $fail diff --git a/tests/test-exclude7.sh b/tests/test-exclude7.sh index 03ed2a668..f75b814e3 100755 --- a/tests/test-exclude7.sh +++ b/tests/test-exclude7.sh @@ -16,29 +16,32 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -TMP=excltmp.$$ -LIST=flist.$$ -ERR=0 +. "${srcdir=.}/init.sh"; path_prepend_ . +fail=0 # Test exclude precedence -cat > $LIST < in < $TMP < expected <$TMP.1 -./test-exclude$EXEEXT -include $LIST -no-include $LIST -- bar | - tr -d '\015' >>$TMP.1 +test-exclude in -include in -- bar > out || exit $? +test-exclude -include in -no-include in -- bar >> out || exit $? -diff -c $TMP $TMP.1 || ERR=1 +# Find out how to remove carriage returns from output. Solaris /usr/ucb/tr +# does not understand '\r'. +case $(echo r | tr -d '\r') in '') cr='\015';; *) cr='\r';; esac -rm -f $TMP $TMP.1 $LIST -exit $ERR +# normalize output +LC_ALL=C tr -d "$cr" < out > k && mv k out + +compare expected out || fail=1 + +Exit $fail diff --git a/tests/test-exclude8.sh b/tests/test-exclude8.sh index 95920708d..b1b010e24 100755 --- a/tests/test-exclude8.sh +++ b/tests/test-exclude8.sh @@ -16,25 +16,31 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -TMP=excltmp.$$ -LIST=flist.$$ -ERR=0 +. "${srcdir=.}/init.sh"; path_prepend_ . +fail=0 # Test escaped metacharacters. -cat > $LIST <<'EOT' +cat > in <<'EOT' f\*e b[a\*]r EOT -cat > $TMP <<'EOT' +cat > expected <<'EOT' f*e: 1 file: 0 bar: 1 EOT -./test-exclude$EXEEXT -wildcards $LIST -- 'f*e' 'file' 'bar' | - tr -d '\015' | diff -c $TMP - || ERR=1 +test-exclude -wildcards in -- 'f*e' 'file' 'bar' > out || exit $? -rm -f $TMP $LIST -exit $ERR +# Find out how to remove carriage returns from output. Solaris /usr/ucb/tr +# does not understand '\r'. +case $(echo r | tr -d '\r') in '') cr='\015';; *) cr='\r';; esac + +# normalize output +LC_ALL=C tr -d "$cr" < out > k && mv k out + +compare expected out || fail=1 + +Exit $fail