summaryrefslogtreecommitdiff
path: root/usr.bin/make
diff options
context:
space:
mode:
authorsjg <sjg@NetBSD.org>2003-08-08 06:42:38 +0000
committersjg <sjg@NetBSD.org>2003-08-08 06:42:38 +0000
commita41eaef46af54752dd413cb9f0283b26fe74ab00 (patch)
tree5e9c80944b90b300293242e0176ab8edd07331c2 /usr.bin/make
parentadd426be7e67d52dfb22056ac2eeb33e48da5312 (diff)
Hook make unit-tests into regress
Diffstat (limited to 'usr.bin/make')
-rw-r--r--usr.bin/make/unit-tests/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/make/unit-tests/Makefile b/usr.bin/make/unit-tests/Makefile
index 5242f1e2c73..cc63592d63a 100644
--- a/usr.bin/make/unit-tests/Makefile
+++ b/usr.bin/make/unit-tests/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 2003/08/01 04:57:20 sjg Exp $
+# $Id: Makefile,v 1.7 2003/08/08 06:42:38 sjg Exp $
#
# Unit tests for make(1)
# The main targets are:
@@ -14,6 +14,8 @@
.MAIN: all
+UNIT_TESTS:= ${.PARSEDIR}
+
all: mod-ts varcmd
LIST= one two three
@@ -42,7 +44,7 @@ mod-ts:
.PHONY: varcmd
varcmd:
- @${.MAKE} -f ${MAKEFILE:H}/varcmd
+ @${.MAKE} -f ${UNIT_TESTS}/varcmd
clean:
rm -f *.out *.fail *.core
@@ -57,7 +59,7 @@ test:
@cd ${.OBJDIR} && ${TEST_MAKE} -f ${MAKEFILE} 2>&1 | \
sed 's,^${TEST_MAKE:T}:,make:,' > ${.TARGET}.out || { \
tail ${.TARGET}.out; mv ${.TARGET}.out ${.TARGET}.fail; exit 1; }
- diff -u ${.CURDIR}/${.TARGET}.exp ${.TARGET}.out
+ diff -u ${UNIT_TESTS}/${.TARGET}.exp ${.TARGET}.out
accept:
mv test.out ${.CURDIR}/test.exp