summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgad <gad@FreeBSD.org>2003-02-10 19:56:42 +0000
committergad <gad@FreeBSD.org>2003-02-10 19:56:42 +0000
commitba1743e91bea2d716235e6ab42a5492659b6c7e6 (patch)
tree146deed17e891dee9850537f62d3f83d9ace56f9
parentf91e91de52eba1732c62fc86909ba79a3435ff26 (diff)
downloadFreeBSD-src-ba1743e91bea2d716235e6ab42a5492659b6c7e6.zip
FreeBSD-src-ba1743e91bea2d716235e6ab42a5492659b6c7e6.tar.gz
The regression-tests for 'make' *expect* to trigger make's warning:
warning: duplicate script for target "double" ignored The regression-tests do try to hide that message, but the message does still appear when using -j (eg: 'make -j5 buildworld'). This changes the regression-test so the expected warning message will not be seen even when -j is specified. Reviewed by: jmallett ru
-rw-r--r--tools/build/make_check/Makefile2
-rw-r--r--tools/regression/usr.bin/make/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/build/make_check/Makefile b/tools/build/make_check/Makefile
index 760433b..0ae687e 100644
--- a/tools/build/make_check/Makefile
+++ b/tools/build/make_check/Makefile
@@ -24,7 +24,7 @@ all:
diff -u ${.CURDIR}/regress.variables.out - || ${MAKE} failure
@echo "PASS: Test variables detected no regression, output matches."
@echo "Running test targets"
- @${MAKE} double || ${MAKE} failure
+ @${MAKE} double 2>/dev/null || ${MAKE} failure
@echo "PASS: Test targets detected no regression."
@echo "Running test sysvmatch"
@${MAKE} sysvmatch || ${MAKE} failure
diff --git a/tools/regression/usr.bin/make/Makefile b/tools/regression/usr.bin/make/Makefile
index 760433b..0ae687e 100644
--- a/tools/regression/usr.bin/make/Makefile
+++ b/tools/regression/usr.bin/make/Makefile
@@ -24,7 +24,7 @@ all:
diff -u ${.CURDIR}/regress.variables.out - || ${MAKE} failure
@echo "PASS: Test variables detected no regression, output matches."
@echo "Running test targets"
- @${MAKE} double || ${MAKE} failure
+ @${MAKE} double 2>/dev/null || ${MAKE} failure
@echo "PASS: Test targets detected no regression."
@echo "Running test sysvmatch"
@${MAKE} sysvmatch || ${MAKE} failure
OpenPOWER on IntegriCloud