diff options
author | Jim Meyering <jim@meyering.net> | 1999-05-15 05:30:51 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 1999-05-15 05:30:51 +0000 |
commit | dace9c747718e2a5beb2785d0207abbf484605e1 (patch) | |
tree | 0fa5a105d1b7d342c7ddaabb44495f1d3f30982b | |
parent | 1acf1ddd6598c521ae52f0e7ff1151fd3d0ad551 (diff) | |
download | coreutils-dace9c747718e2a5beb2785d0207abbf484605e1.tar.xz |
.
-rw-r--r-- | old/textutils/ChangeLog | 6 | ||||
-rw-r--r-- | tests/join/Makefile.am | 5 | ||||
-rw-r--r-- | tests/join/Makefile.in | 8 | ||||
-rwxr-xr-x | tests/join/join-tests | 19 |
4 files changed, 31 insertions, 7 deletions
diff --git a/old/textutils/ChangeLog b/old/textutils/ChangeLog index 5eadfe770..44a959e78 100644 --- a/old/textutils/ChangeLog +++ b/old/textutils/ChangeLog @@ -1,3 +1,9 @@ +1999-05-15 Jim Meyering <meyering@ascend.com> + + * tests/join/Test.pm (trailing-sp): New test for this fix. + * src/join.c (xfields): Don't interpret a trailing blank as a + delimiter when e.g. -t: was specified. From Tim Smithers. + 1999-05-12 Jim Meyering <meyering@ascend.com> * tests/Makefile.am (envvar-check): Renamed from check-local. diff --git a/tests/join/Makefile.am b/tests/join/Makefile.am index f656a4ea0..a15ecc967 100644 --- a/tests/join/Makefile.am +++ b/tests/join/Makefile.am @@ -11,12 +11,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 \ 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 +9a.I1 9a.I2 9a.X trailing-sp.I1 trailing-sp.I2 trailing-sp.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 +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 ##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 4049c1b73..00df94c86 100644 --- a/tests/join/Makefile.in +++ b/tests/join/Makefile.in @@ -105,13 +105,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 +9a.I1 9a.I2 9a.X trailing-sp.I1 trailing-sp.I2 trailing-sp.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 +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 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) @@ -126,6 +127,7 @@ mk_script = $(srcdir)/../mk-script MAINTAINERCLEANFILES = $x-tests $(maint_gen) CLEANFILES = $(run_gen) +subdir = tests/join mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = @@ -153,8 +155,6 @@ TAGS: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) -subdir = tests/join - distdir: $(DISTFILES) here=`cd $(top_builddir) && pwd`; \ top_distdir=`cd $(top_distdir) && pwd`; \ diff --git a/tests/join/join-tests b/tests/join/join-tests index 3a0b08725..846b04460 100755 --- a/tests/join/join-tests +++ b/tests/join/join-tests @@ -613,8 +613,25 @@ else esac fi test -s 9a.E || rm -f 9a.E +$xx -t: -1 1 -2 1 $srcdir/trailing-sp.I1 $srcdir/trailing-sp.I2 > trailing-sp.O 2> trailing-sp.E +code=$? +if test $code != 0 ; then + $echo "Test trailing-sp failed: ../../src/join return code $code differs from expected value 0" 1>&2 + errors=`expr $errors + 1` +else + cmp trailing-sp.O $srcdir/trailing-sp.X > /dev/null 2>&1 + case $? in + 0) if test "$VERBOSE" ; then $echo "passed trailing-sp"; fi ;; + 1) $echo "Test trailing-sp failed: files trailing-sp.O and $srcdir/trailing-sp.X differ" 1>&2; + errors=`expr $errors + 1` ;; + 2) $echo "Test trailing-sp may have failed." 1>&2; + $echo The command "cmp trailing-sp.O $srcdir/trailing-sp.X" failed. 1>&2 ; + errors=`expr $errors + 1` ;; + esac +fi +test -s trailing-sp.E || rm -f trailing-sp.E if test $errors = 0 ; then - $echo Passed all 35 tests. 1>&2 + $echo Passed all 36 tests. 1>&2 else $echo Failed $errors tests. 1>&2 fi |