diff options
| author |   bluhm <bluhm@openbsd.org> | 2018-04-01 11:07:52 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2018-04-01 11:07:52 +0000 |
| commit | 54e81d41cfbb77cfdbc8ee49f4f87120aa9228db (patch) | |
| tree | d6c1844c91024a0eb5ceae613b23c0d7111c7e1b /regress/usr.bin/apply | |
| parent | tweak previous; (diff) | |
| download | wireguard-openbsd-54e81d41cfbb77cfdbc8ee49f4f87120aa9228db.tar.xz wireguard-openbsd-54e81d41cfbb77cfdbc8ee49f4f87120aa9228db.zip | |
Fix .CURDIR to run with obj directory.
Avoid useless sub shell in make command.
Be more verbose as such tests are easier to debug.
Use absolute path by default to see which apply is tested.
Diffstat (limited to 'regress/usr.bin/apply')
| -rw-r--r-- | regress/usr.bin/apply/Makefile | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/regress/usr.bin/apply/Makefile b/regress/usr.bin/apply/Makefile index d46325027f6..d1370ec3a5b 100644 --- a/regress/usr.bin/apply/Makefile +++ b/regress/usr.bin/apply/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.1 2018/03/27 10:00:16 tobias Exp $ +# $OpenBSD: Makefile,v 1.2 2018/04/01 11:07:52 bluhm Exp $ -APPLY?= apply +APPLY?= /usr/bin/apply CLEANFILES= *.res REGRESS_TARGETS=t1 t2 t3 t4 t5 t6 @@ -17,39 +17,39 @@ REGRESS_TARGETS=t1 t2 t3 t4 t5 t6 t1: @echo ${*} - @(${APPLY} "echo %1 %1 %1 %1" `cat ${*}.in` > ${*}.res) - @cmp -s ${*}.out ${.CURDIR}/${*}.res || \ + ${APPLY} "echo %1 %1 %1 %1" `cat ${.CURDIR}/${*}.in` > ${*}.res + @cmp -s ${.CURDIR}/${*}.out ${*}.res || \ (echo "XXX ${*} failed" && false) t2: @echo ${*} - @ARG_MAX=`getconf ARG_MAX`;\ + ARG_MAX=`getconf ARG_MAX`;\ ARG_MAX_HALF=$$((ARG_MAX / 2)); \ ! ${APPLY} "echo %1 %1 %1" \ `jot $$ARG_MAX_HALF 1 1 | tr -d '\n'` > ${*}.res 2>&1 t3: @echo ${*} - @(${APPLY} -0 -d who 1 2 3 4 5 > ${*}.res) - @cmp -s ${*}.out ${.CURDIR}/${*}.res || \ + ${APPLY} -0 -d who 1 2 3 4 5 > ${*}.res + @cmp -s ${.CURDIR}/${*}.out ${*}.res || \ (echo "XXX ${*} failed" && false) t4: @echo ${*} - @(${APPLY} -2 -d cmp a1 b1 a2 b2 a3 b3 > ${*}.res) - @cmp -s ${*}.out ${.CURDIR}/${*}.res || \ + ${APPLY} -2 -d cmp a1 b1 a2 b2 a3 b3 > ${*}.res + @cmp -s ${.CURDIR}/${*}.out ${*}.res || \ (echo "XXX ${*} failed" && false) t5: @echo ${*} - @(${APPLY} -a "&" "echo &2 &1" hello world > ${*}.res) - @cmp -s ${*}.out ${.CURDIR}/${*}.res || \ + ${APPLY} -a "&" "echo &2 &1" hello world > ${*}.res + @cmp -s ${.CURDIR}/${*}.out ${*}.res || \ (echo "XXX ${*} failed" && false) t6: @echo ${*} - @(${APPLY} -a " " -d "2to3 1" test.py > ${*}.res) - @cmp -s ${*}.out ${.CURDIR}/${*}.res || \ + ${APPLY} -a " " -d "2to3 1" test.py > ${*}.res + @cmp -s ${.CURDIR}/${*}.out ${*}.res || \ (echo "XXX ${*} failed" && false) .include <bsd.regress.mk> |