diff options
author | jmallett <jmallett@FreeBSD.org> | 2002-06-24 13:52:28 +0000 |
---|---|---|
committer | jmallett <jmallett@FreeBSD.org> | 2002-06-24 13:52:28 +0000 |
commit | 0309fb3139201cfe15f9590262dfe4ee00851823 (patch) | |
tree | a0894c70a89fe5ff44526f204b51c34f504b5eec /tools/regression/usr.bin/xargs | |
parent | 19361eefdfe5fdd95aa861cd7e85012fef653176 (diff) | |
download | FreeBSD-src-0309fb3139201cfe15f9590262dfe4ee00851823.zip FreeBSD-src-0309fb3139201cfe15f9590262dfe4ee00851823.tar.gz |
Convert straightforward regression tests to use regress.m4.
Goodbye, duplicated code, you will certainly not be missed.
Diffstat (limited to 'tools/regression/usr.bin/xargs')
-rw-r--r-- | tools/regression/usr.bin/xargs/Makefile | 2 | ||||
-rw-r--r-- | tools/regression/usr.bin/xargs/regress.sh | 42 |
2 files changed, 8 insertions, 36 deletions
diff --git a/tools/regression/usr.bin/xargs/Makefile b/tools/regression/usr.bin/xargs/Makefile index 9903670..b937d41 100644 --- a/tools/regression/usr.bin/xargs/Makefile +++ b/tools/regression/usr.bin/xargs/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/xargs/regress.sh b/tools/regression/usr.bin/xargs/regress.sh index 5c83b5c..dbf0ecc 100644 --- a/tools/regression/usr.bin/xargs/regress.sh +++ b/tools/regression/usr.bin/xargs/regress.sh @@ -1,39 +1,11 @@ # $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) -STATUS=0 +REGRESSION_TEST(`normal', `xargs echo The < regress.in') +REGRESSION_TEST(`I', `xargs -I% echo The % % % %% % % < regress.in') +REGRESSION_TEST(`J', `xargs -J% echo The % again. < regress.in') +REGRESSION_TEST(`L', `xargs -L3 echo < regress.in') +REGRESSION_TEST(`R', `xargs -I% -R1 echo The % % % %% % % < regress.in') -for test in normal I J L R; do - echo "Running test $test" - case "$test" in - normal) - xargs echo The < regress.in | diff -u regress.$test.out - - ;; - I) - xargs -I% echo The % % % %% % % < regress.in | diff -u regress.$test.out - - ;; - J) - xargs -J% echo The % again. < regress.in | diff -u regress.$test.out - - ;; - L) - xargs -L3 echo < regress.in | diff -u regress.$test.out - - ;; - R) - xargs -I% -R1 echo The % % % %% % % < regress.in | diff -u regress.$test.out - - ;; - esac - if [ $? -eq 0 ]; then - echo "PASS: Test $test detected no regression, output matches." - else - STATUS=$? - echo "FAIL: Test $test failed: regression detected. See above." - fi -done - -exit $STATUS +REGRESSION_END() |