summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorjmallett <jmallett@FreeBSD.org>2002-06-20 03:08:20 +0000
committerjmallett <jmallett@FreeBSD.org>2002-06-20 03:08:20 +0000
commited011dddc10df7cba4f203ce47d02496bb3f5f06 (patch)
tree095eeb36fffa4467923ff2dd069c1698f3d099dc /tools
parentb4762c84fbb2f99591248d99a3f0604dcf97ec8e (diff)
downloadFreeBSD-src-ed011dddc10df7cba4f203ce47d02496bb3f5f06.zip
FreeBSD-src-ed011dddc10df7cba4f203ce47d02496bb3f5f06.tar.gz
Grrr, make the test for embedded variables in the left-hand-side actually do
the right thing in every case. Yuck.
Diffstat (limited to 'tools')
-rw-r--r--tools/build/make_check/Makefile4
-rw-r--r--tools/regression/usr.bin/make/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/build/make_check/Makefile b/tools/build/make_check/Makefile
index f92febc..9cd2890 100644
--- a/tools/build/make_check/Makefile
+++ b/tools/build/make_check/Makefile
@@ -30,7 +30,7 @@ all:
@${MAKE} sysvmatch || ${MAKE} failure
@echo "PASS: Test sysvmatch detected no regression."
@echo "Running test lhs_expn"
- @${MAKE} lhs_expn || ${MAKE} failure
+ @! ${MAKE} lhs_expn && true || ${MAKE} failure
@echo "PASS: Test lhs_expn detected no regression."
# Doubly-defined targets. NetBSD make(1) will warn, ours will silently use the
@@ -50,7 +50,7 @@ sysvmatch:
# program has not errored out because of the recursion caused by not expanding
# the left-hand-side's embedded variables above.
lhs_expn:
- @false
+ @true
failure:
@echo "FAIL: Test failed: regression detected. See above."
diff --git a/tools/regression/usr.bin/make/Makefile b/tools/regression/usr.bin/make/Makefile
index f92febc..9cd2890 100644
--- a/tools/regression/usr.bin/make/Makefile
+++ b/tools/regression/usr.bin/make/Makefile
@@ -30,7 +30,7 @@ all:
@${MAKE} sysvmatch || ${MAKE} failure
@echo "PASS: Test sysvmatch detected no regression."
@echo "Running test lhs_expn"
- @${MAKE} lhs_expn || ${MAKE} failure
+ @! ${MAKE} lhs_expn && true || ${MAKE} failure
@echo "PASS: Test lhs_expn detected no regression."
# Doubly-defined targets. NetBSD make(1) will warn, ours will silently use the
@@ -50,7 +50,7 @@ sysvmatch:
# program has not errored out because of the recursion caused by not expanding
# the left-hand-side's embedded variables above.
lhs_expn:
- @false
+ @true
failure:
@echo "FAIL: Test failed: regression detected. See above."
OpenPOWER on IntegriCloud