From e7328f4f56c3aaed275de769d3703c6a9ee25567 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 15 Jul 1999 16:15:17 +0000 Subject: . --- tests/join/Makefile.am | 5 +++-- tests/join/Makefile.in | 4 ++-- tests/join/join-tests | 19 ++++++++++++++++++- 3 files changed, 23 insertions(+), 5 deletions(-) (limited to 'tests/join') diff --git a/tests/join/Makefile.am b/tests/join/Makefile.am index a15ecc967..ca8d340f8 100644 --- a/tests/join/Makefile.am +++ b/tests/join/Makefile.am @@ -11,13 +11,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 \ 5g.I1 5g.I2 5g.X 5h.I1 5h.I2 5h.X 5i.I1 5i.I2 5i.X 5j.I1 5j.I2 5j.X 5k.I1 \ 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 +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 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 +trailing-sp.E sp-vs-blank.O sp-vs-blank.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 5edae81ed..f35f7cb84 100644 --- a/tests/join/Makefile.in +++ b/tests/join/Makefile.in @@ -106,14 +106,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 lc-collate.I1 lc-collate.I2 lc-collate.X +sp-vs-blank.I2 sp-vs-blank.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 lc-collate.O lc-collate.E +trailing-sp.E sp-vs-blank.O sp-vs-blank.E EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) diff --git a/tests/join/join-tests b/tests/join/join-tests index 846b04460..dacc781cf 100755 --- a/tests/join/join-tests +++ b/tests/join/join-tests @@ -630,8 +630,25 @@ else esac fi test -s trailing-sp.E || rm -f trailing-sp.E +$xx $srcdir/sp-vs-blank.I1 $srcdir/sp-vs-blank.I2 > sp-vs-blank.O 2> sp-vs-blank.E +code=$? +if test $code != 0 ; then + $echo "Test sp-vs-blank failed: ../../src/join return code $code differs from expected value 0" 1>&2 + errors=`expr $errors + 1` +else + cmp sp-vs-blank.O $srcdir/sp-vs-blank.X > /dev/null 2>&1 + case $? in + 0) if test "$VERBOSE" ; then $echo "passed sp-vs-blank"; fi ;; + 1) $echo "Test sp-vs-blank failed: files sp-vs-blank.O and $srcdir/sp-vs-blank.X differ" 1>&2; + errors=`expr $errors + 1` ;; + 2) $echo "Test sp-vs-blank may have failed." 1>&2; + $echo The command "cmp sp-vs-blank.O $srcdir/sp-vs-blank.X" failed. 1>&2 ; + errors=`expr $errors + 1` ;; + esac +fi +test -s sp-vs-blank.E || rm -f sp-vs-blank.E if test $errors = 0 ; then - $echo Passed all 36 tests. 1>&2 + $echo Passed all 37 tests. 1>&2 else $echo Failed $errors tests. 1>&2 fi -- cgit v1.2.3-54-g00ecf