diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2003-07-22 19:49:35 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2003-07-22 19:49:35 +0000 |
| commit | c9549ed55691fa892303ed6a7113417079598b5f (patch) | |
| tree | ec5927ae6673900828b8e3b4c67cdf66224a2263 | |
| parent | f7257e19db452fc64bb28fe9531233daca3bbc00 (diff) | |
Allow user to override default version of patch used; otto@ OK
| -rw-r--r-- | regress/usr.bin/diff/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/regress/usr.bin/diff/Makefile b/regress/usr.bin/diff/Makefile index a55b2ce5dae..25300509a43 100644 --- a/regress/usr.bin/diff/Makefile +++ b/regress/usr.bin/diff/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.3 2003/07/22 19:34:16 otto Exp $ +# $OpenBSD: Makefile,v 1.4 2003/07/22 19:49:34 millert Exp $ REGRESS_TARGETS=t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 DIFF=diff +PATCH=patch # Skip the cmp(1) part for ed(1) style diffs for these tests EDSKIPCMP=t7 t10 @@ -36,10 +37,10 @@ all: clean ${REGRESS_TARGET} @${DIFF} -c ${.CURDIR}/${*}.1 ${.CURDIR}/${*}.2 > ${*}.c.patch || true @${DIFF} -u ${.CURDIR}/${*}.1 ${.CURDIR}/${*}.2 > ${*}.u.patch || true @${DIFF} -e ${.CURDIR}/${*}.1 ${.CURDIR}/${*}.2 > ${*}.e.patch || true - @patch -s ${*}.copy ${*}.patch || true - @patch -s ${*}.c.copy ${*}.c.patch || true - @patch -s ${*}.u.copy ${*}.u.patch || true - @patch -s ${*}.e.copy ${*}.e.patch || true + @${PATCH} -s ${*}.copy ${*}.patch || true + @${PATCH} -s ${*}.c.copy ${*}.c.patch || true + @${PATCH} -s ${*}.u.copy ${*}.u.patch || true + @${PATCH} -s ${*}.e.copy ${*}.e.patch || true @cmp -s ${.CURDIR}/${*}.2 ${*}.copy || \ (echo "XXX ${*} standard diff failed" && false) @cmp -s ${.CURDIR}/${*}.2 ${*}.c.copy || \ |