summaryrefslogtreecommitdiffstats
path: root/tools/regression/usr.bin/join
diff options
context:
space:
mode:
authorjmallett <jmallett@FreeBSD.org>2002-06-24 14:22:44 +0000
committerjmallett <jmallett@FreeBSD.org>2002-06-24 14:22:44 +0000
commit9d6012e9cff6568695d5687f1363e64284be1704 (patch)
treeb5307ddbfe04c261e575860283cd6be7e4605b37 /tools/regression/usr.bin/join
parent93460fd6eff0b0cedfcc83460ad7f63ecab0630d (diff)
downloadFreeBSD-src-9d6012e9cff6568695d5687f1363e64284be1704.zip
FreeBSD-src-9d6012e9cff6568695d5687f1363e64284be1704.tar.gz
Move all remaining tests except for:
make(1): Does not work like the other tests. Its Makefile is self-testing. m4(1): It uses complex voodo to test GNU m4(1) features. To the new framework. I had worried about passing the binary data that uudecode(1)'s test passes to diff(1) might give a user something nasty, but this is unlikely to happen as even with an unmodified old nasty diff(1) which doesn't recognise many binary files, these binary files are recognised. Using $DIFF instead of `diff' in the library and making it possible to override this with `cmp -s' might be nice some day, but as of this second, there's no immediate need.
Diffstat (limited to 'tools/regression/usr.bin/join')
-rw-r--r--tools/regression/usr.bin/join/Makefile2
-rw-r--r--tools/regression/usr.bin/join/regress.sh18
2 files changed, 5 insertions, 15 deletions
diff --git a/tools/regression/usr.bin/join/Makefile b/tools/regression/usr.bin/join/Makefile
index 9903670..b937d41 100644
--- a/tools/regression/usr.bin/join/Makefile
+++ b/tools/regression/usr.bin/join/Makefile
@@ -1,4 +1,4 @@
# $FreeBSD$
all:
- @sh ${.CURDIR}/regress.sh ${.CURDIR}
+ @m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
diff --git a/tools/regression/usr.bin/join/regress.sh b/tools/regression/usr.bin/join/regress.sh
index 2c2e9a7..ee041f2 100644
--- a/tools/regression/usr.bin/join/regress.sh
+++ b/tools/regression/usr.bin/join/regress.sh
@@ -1,17 +1,7 @@
# $FreeBSD$
-# Go into the regression test directory, handed to us by make(1)
-TESTDIR=$1
-if [ -z "$TESTDIR" ]; then
- TESTDIR=.
-fi
-cd $TESTDIR
+REGRESSION_START($1)
-join -t , -a1 -a2 -e '(unknown)' -o 0,1.2,2.2 regress.1.in regress.2.in | \
- diff -u regress.out -
-if [ $? -eq 0 ]; then
- echo "PASS: Test detected no regression, output matches."
-else
- echo "FAIL: Test failed: regression detected. See above."
- exit 1
-fi
+REGRESSION_TEST_ONE(`join -t , -a1 -a2 -e "(unknown)" -o 0,1.2,2.2 regress.1.in regress.2.in')
+
+REGRESSION_END()
OpenPOWER on IntegriCloud