diff options
author | Jim Meyering <jim@meyering.net> | 2000-11-17 10:16:22 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 2000-11-17 10:16:22 +0000 |
commit | 9a25583ef183ed1e3a0d64699f8b0de271fb31c7 (patch) | |
tree | a49caf4ca38289bf9b776d301cc10023251eab3d /tests/join | |
parent | d32d63e21173155b5d4b9a18352b7194c9a85960 (diff) | |
download | coreutils-9a25583ef183ed1e3a0d64699f8b0de271fb31c7.tar.xz |
.
Diffstat (limited to 'tests/join')
-rw-r--r-- | tests/join/Makefile.am | 4 | ||||
-rw-r--r-- | tests/join/Makefile.in | 4 | ||||
-rwxr-xr-x | tests/join/join-tests | 20 |
3 files changed, 23 insertions, 5 deletions
diff --git a/tests/join/Makefile.am b/tests/join/Makefile.am index a3ec1f7c7..6cae48b30 100644 --- a/tests/join/Makefile.am +++ b/tests/join/Makefile.am @@ -12,13 +12,13 @@ maint_gen = 1a.I1 1a.I2 1a.X 1b.I1 1b.I2 1b.X 1c.I1 1c.I2 1c.X 1d.I1 1d.I2 \ 5k.I2 5k.X 5l.I1 5l.I2 5l.X 5m.I1 5m.I2 5m.X 6a.I1 6a.I2 6a.X 6b.I1 6b.I2 \ 6b.X 6c.I1 6c.I2 6c.X 7a.I1 7a.I2 7a.X 8a.I1 8a.I2 8a.X 8b.I1 8b.I2 8b.X \ 9a.I1 9a.I2 9a.X trailing-sp.I1 trailing-sp.I2 trailing-sp.X sp-vs-blank.I1 \ -sp-vs-blank.I2 sp-vs-blank.X +sp-vs-blank.I2 sp-vs-blank.X 8-bit-t.I1 8-bit-t.I2 8-bit-t.X run_gen = 1a.O 1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 2a.O \ 2a.E 2b.O 2b.E 2c.O 2c.E 3a.O 3a.E 4a.O 4a.E 4b.O 4b.E 4c.O 4c.E 4d.O 4d.E \ 4e.O 4e.E 5a.O 5a.E 5b.O 5b.E 5c.O 5c.E 5d.O 5d.E 5e.O 5e.E 5f.O 5f.E 5g.O \ 5g.E 5h.O 5h.E 5i.O 5i.E 5j.O 5j.E 5k.O 5k.E 5l.O 5l.E 5m.O 5m.E 6a.O 6a.E \ 6b.O 6b.E 6c.O 6c.E 7a.O 7a.E 8a.O 8a.E 8b.O 8b.E 9a.O 9a.E trailing-sp.O \ -trailing-sp.E sp-vs-blank.O sp-vs-blank.E +trailing-sp.E sp-vs-blank.O sp-vs-blank.E 8-bit-t.O 8-bit-t.E ##test-files-end EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) diff --git a/tests/join/Makefile.in b/tests/join/Makefile.in index ef2054233..743089828 100644 --- a/tests/join/Makefile.in +++ b/tests/join/Makefile.in @@ -127,14 +127,14 @@ maint_gen = 1a.I1 1a.I2 1a.X 1b.I1 1b.I2 1b.X 1c.I1 1c.I2 1c.X 1d.I1 1d.I2 \ 5k.I2 5k.X 5l.I1 5l.I2 5l.X 5m.I1 5m.I2 5m.X 6a.I1 6a.I2 6a.X 6b.I1 6b.I2 \ 6b.X 6c.I1 6c.I2 6c.X 7a.I1 7a.I2 7a.X 8a.I1 8a.I2 8a.X 8b.I1 8b.I2 8b.X \ 9a.I1 9a.I2 9a.X trailing-sp.I1 trailing-sp.I2 trailing-sp.X sp-vs-blank.I1 \ -sp-vs-blank.I2 sp-vs-blank.X +sp-vs-blank.I2 sp-vs-blank.X 8-bit-t.I1 8-bit-t.I2 8-bit-t.X run_gen = 1a.O 1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 2a.O \ 2a.E 2b.O 2b.E 2c.O 2c.E 3a.O 3a.E 4a.O 4a.E 4b.O 4b.E 4c.O 4c.E 4d.O 4d.E \ 4e.O 4e.E 5a.O 5a.E 5b.O 5b.E 5c.O 5c.E 5d.O 5d.E 5e.O 5e.E 5f.O 5f.E 5g.O \ 5g.E 5h.O 5h.E 5i.O 5i.E 5j.O 5j.E 5k.O 5k.E 5l.O 5l.E 5m.O 5m.E 6a.O 6a.E \ 6b.O 6b.E 6c.O 6c.E 7a.O 7a.E 8a.O 8a.E 8b.O 8b.E 9a.O 9a.E trailing-sp.O \ -trailing-sp.E sp-vs-blank.O sp-vs-blank.E +trailing-sp.E sp-vs-blank.O sp-vs-blank.E 8-bit-t.O 8-bit-t.E EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) diff --git a/tests/join/join-tests b/tests/join/join-tests index bc26283ba..214b871b8 100755 --- a/tests/join/join-tests +++ b/tests/join/join-tests @@ -684,8 +684,26 @@ else esac fi test -s sp-vs-blank.E || rm -f sp-vs-blank.E +$xx -t§ $srcdir/8-bit-t.I1 $srcdir/8-bit-t.I2 > 8-bit-t.O 2> 8-bit-t.E +code=$? +if test $code != 0; then + $echo "Test 8-bit-t failed: ../../src/join return code $code differs from expected value 0" 1>&2 + errors=`expr $errors + 1` +else + cmp 8-bit-t.O $srcdir/8-bit-t.X > /dev/null 2>&1 + case $? in + 0) if test "$VERBOSE"; then $echo "passed 8-bit-t"; fi;; + 1) $echo "Test 8-bit-t failed: files 8-bit-t.O and $srcdir/8-bit-t.X differ" 1>&2 + (diff -c 8-bit-t.O $srcdir/8-bit-t.X) 2> /dev/null + errors=`expr $errors + 1`;; + 2) $echo "Test 8-bit-t may have failed." 1>&2 + $echo The command "cmp 8-bit-t.O $srcdir/8-bit-t.X" failed. 1>&2 + errors=`expr $errors + 1`;; + esac +fi +test -s 8-bit-t.E || rm -f 8-bit-t.E if test $errors = 0; then - $echo Passed all 37 tests. 1>&2 + $echo Passed all 38 tests. 1>&2 else $echo Failed $errors tests. 1>&2 fi |