summaryrefslogtreecommitdiff
path: root/tests/join
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2004-03-10 17:40:00 +0000
committerJim Meyering <jim@meyering.net>2004-03-10 17:40:00 +0000
commit865191785634f1d1f55da7b37807b4cf5793ee24 (patch)
treee5b2acaa0f63a548b95f66d130542455f4a93f04 /tests/join
parentbfafc5243e506ca10a754bfcb0a63f1b85415519 (diff)
downloadcoreutils-865191785634f1d1f55da7b37807b4cf5793ee24.tar.xz
.
Diffstat (limited to 'tests/join')
-rw-r--r--tests/join/Makefile.am5
-rw-r--r--tests/join/Makefile.in5
-rwxr-xr-xtests/join/join-tests20
3 files changed, 25 insertions, 5 deletions
diff --git a/tests/join/Makefile.am b/tests/join/Makefile.am
index b4998f2fa..d34a6750d 100644
--- a/tests/join/Makefile.am
+++ b/tests/join/Makefile.am
@@ -12,13 +12,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 8-bit-t.I1 8-bit-t.I2 8-bit-t.X
+sp-vs-blank.I2 sp-vs-blank.X 8-bit-t.I1 8-bit-t.I2 8-bit-t.X invalid-j.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 8-bit-t.O 8-bit-t.E
+trailing-sp.E sp-vs-blank.O sp-vs-blank.E 8-bit-t.O 8-bit-t.E invalid-j.O \
+invalid-j.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 c0baab491..d205da829 100644
--- a/tests/join/Makefile.in
+++ b/tests/join/Makefile.in
@@ -270,14 +270,15 @@ 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 8-bit-t.I1 8-bit-t.I2 8-bit-t.X
+sp-vs-blank.I2 sp-vs-blank.X 8-bit-t.I1 8-bit-t.I2 8-bit-t.X invalid-j.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 8-bit-t.O 8-bit-t.E
+trailing-sp.E sp-vs-blank.O sp-vs-blank.E 8-bit-t.O 8-bit-t.E invalid-j.O \
+invalid-j.E
EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
noinst_SCRIPTS = $x-tests
diff --git a/tests/join/join-tests b/tests/join/join-tests
index f30aaf840..cf5a53198 100755
--- a/tests/join/join-tests
+++ b/tests/join/join-tests
@@ -702,8 +702,26 @@ else
esac
fi
test -s 8-bit-t.E || rm -f 8-bit-t.E
+$xx -j x > invalid-j.O 2> invalid-j.E
+code=$?
+if test $code != 1; then
+ $echo "Test invalid-j failed: $xx return code $code differs from expected value 1" 1>&2
+ errors=`expr $errors + 1`
+else
+ cmp invalid-j.O $srcdir/invalid-j.X > /dev/null 2>&1
+ case $? in
+ 0) if test "$VERBOSE"; then $echo "passed invalid-j"; fi;;
+ 1) $echo "Test invalid-j failed: files invalid-j.O and $srcdir/invalid-j.X differ" 1>&2
+ (diff -c invalid-j.O $srcdir/invalid-j.X) 2> /dev/null
+ errors=`expr $errors + 1`;;
+ 2) $echo "Test invalid-j may have failed." 1>&2
+ $echo The command "cmp invalid-j.O $srcdir/invalid-j.X" failed. 1>&2
+ errors=`expr $errors + 1`;;
+ esac
+fi
+test -s invalid-j.E || rm -f invalid-j.E
if test $errors = 0; then
- $echo Passed all 38 tests. 1>&2
+ $echo Passed all 39 tests. 1>&2
else
$echo Failed $errors tests. 1>&2
fi