From ed011dddc10df7cba4f203ce47d02496bb3f5f06 Mon Sep 17 00:00:00 2001 From: jmallett Date: Thu, 20 Jun 2002 03:08:20 +0000 Subject: [PATCH] Grrr, make the test for embedded variables in the left-hand-side actually do the right thing in every case. Yuck. --- tools/build/make_check/Makefile | 4 ++-- tools/regression/usr.bin/make/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/build/make_check/Makefile b/tools/build/make_check/Makefile index f92febc48fe2..9cd2890c15c6 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 f92febc48fe2..9cd2890c15c6 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."