summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorjmallett <jmallett@FreeBSD.org>2002-10-25 06:17:44 +0000
committerjmallett <jmallett@FreeBSD.org>2002-10-25 06:17:44 +0000
commit46c27244ebd5d5f122bd86c34182fabeee414a0e (patch)
tree907f0abc8e5489f92d75137afbbff08d379c0346 /tools
parentbd5713dabc9b7b7a6ce32f3605c651c75f4a4893 (diff)
downloadFreeBSD-src-46c27244ebd5d5f122bd86c34182fabeee414a0e.zip
FreeBSD-src-46c27244ebd5d5f122bd86c34182fabeee414a0e.tar.gz
Hide the test in <target> under '.if make(<target>)' so as to not get any
errors/warnings related to crud in said test block.
Diffstat (limited to 'tools')
-rw-r--r--tools/build/make_check/Makefile4
-rw-r--r--tools/regression/usr.bin/make/Makefile4
2 files changed, 8 insertions, 0 deletions
diff --git a/tools/build/make_check/Makefile b/tools/build/make_check/Makefile
index d8e5509..57b0d8f 100644
--- a/tools/build/make_check/Makefile
+++ b/tools/build/make_check/Makefile
@@ -33,6 +33,7 @@ all:
@! ${MAKE} lhs_expn && true || ${MAKE} failure
@echo "PASS: Test lhs_expn detected no regression."
+.if make(double)
# Doubly-defined targets. make(1) will warn, but use the "right" one. If it
# switches to using the "non-right" one, it breaks things worse than a little
# regression test.
@@ -41,11 +42,14 @@ double:
double:
@false
+.endif
+.if make(sysvmatch)
# Some versions of FreeBSD make(1) do not handle a nil LHS in sysvsubst.
sysvmatch:
@echo EMPTY ${NIL:=foo} LHS | \
diff -u ${.CURDIR}/regress.sysvmatch.out - || false
+.endif
# A bogus target for the lhs_expn test; If this is reached, then the make(1)
# program has not errored out because of the recursion caused by not expanding
diff --git a/tools/regression/usr.bin/make/Makefile b/tools/regression/usr.bin/make/Makefile
index d8e5509..57b0d8f 100644
--- a/tools/regression/usr.bin/make/Makefile
+++ b/tools/regression/usr.bin/make/Makefile
@@ -33,6 +33,7 @@ all:
@! ${MAKE} lhs_expn && true || ${MAKE} failure
@echo "PASS: Test lhs_expn detected no regression."
+.if make(double)
# Doubly-defined targets. make(1) will warn, but use the "right" one. If it
# switches to using the "non-right" one, it breaks things worse than a little
# regression test.
@@ -41,11 +42,14 @@ double:
double:
@false
+.endif
+.if make(sysvmatch)
# Some versions of FreeBSD make(1) do not handle a nil LHS in sysvsubst.
sysvmatch:
@echo EMPTY ${NIL:=foo} LHS | \
diff -u ${.CURDIR}/regress.sysvmatch.out - || false
+.endif
# A bogus target for the lhs_expn test; If this is reached, then the make(1)
# program has not errored out because of the recursion caused by not expanding
OpenPOWER on IntegriCloud