Module Name: src
Committed By: sjg
Date: Thu Jan 7 18:11:23 UTC 2021
Modified Files:
src/usr.bin/make/unit-tests: jobs-error-nested-make.exp
jobs-error-nested-make.mk
Log Message:
Remove .MAKE from nested target which is not a sub-make
This does not fix the issue, just makes the unit-test more accurate.
PR: 55578
Reviewed by: rillig
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/usr.bin/make/unit-tests/jobs-error-nested-make.exp \
src/usr.bin/make/unit-tests/jobs-error-nested-make.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/jobs-error-nested-make.exp
diff -u src/usr.bin/make/unit-tests/jobs-error-nested-make.exp:1.1 src/usr.bin/make/unit-tests/jobs-error-nested-make.exp:1.2
--- src/usr.bin/make/unit-tests/jobs-error-nested-make.exp:1.1 Tue Dec 1 17:50:04 2020
+++ src/usr.bin/make/unit-tests/jobs-error-nested-make.exp Thu Jan 7 18:11:23 2021
@@ -1,3 +1,9 @@
make -f jobs-error-nested-make.mk nested
false
+*** [nested] Error code 1
+
+make: stopped in unit-tests
+1 error
+
+make: stopped in unit-tests
exit status 2
Index: src/usr.bin/make/unit-tests/jobs-error-nested-make.mk
diff -u src/usr.bin/make/unit-tests/jobs-error-nested-make.mk:1.1 src/usr.bin/make/unit-tests/jobs-error-nested-make.mk:1.2
--- src/usr.bin/make/unit-tests/jobs-error-nested-make.mk:1.1 Tue Dec 1 17:50:04 2020
+++ src/usr.bin/make/unit-tests/jobs-error-nested-make.mk Thu Jan 7 18:11:23 2021
@@ -1,4 +1,4 @@
-# $NetBSD: jobs-error-nested-make.mk,v 1.1 2020/12/01 17:50:04 rillig Exp $
+# $NetBSD: jobs-error-nested-make.mk,v 1.2 2021/01/07 18:11:23 sjg Exp $
#
# Ensure that in jobs mode, when a command fails, the current directory is
# printed, to aid in debugging, even if the target is marked as .MAKE.
@@ -16,5 +16,5 @@
all: .PHONY .MAKE
${MAKE} -f ${MAKEFILE} nested
-nested: .PHONY .MAKE
+nested: .PHONY
false
