From 46c27244ebd5d5f122bd86c34182fabeee414a0e Mon Sep 17 00:00:00 2001 From: jmallett Date: Fri, 25 Oct 2002 06:17:44 +0000 Subject: [PATCH] Hide the test in under '.if make()' so as to not get any errors/warnings related to crud in said test block. --- tools/build/make_check/Makefile | 4 ++++ tools/regression/usr.bin/make/Makefile | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/tools/build/make_check/Makefile b/tools/build/make_check/Makefile index d8e55097d264..57b0d8fc75d0 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 d8e55097d264..57b0d8fc75d0 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