Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make/unit-tests Remove .MAKE from nested target whic...



details:   https://anonhg.NetBSD.org/src/rev/3f5c7b760e6a
branches:  trunk
changeset: 949273:3f5c7b760e6a
user:      sjg <sjg%NetBSD.org@localhost>
date:      Thu Jan 07 18:11:23 2021 +0000

description:
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

diffstat:

 usr.bin/make/unit-tests/jobs-error-nested-make.exp |  6 ++++++
 usr.bin/make/unit-tests/jobs-error-nested-make.mk  |  4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 6636e57343ac -r 3f5c7b760e6a usr.bin/make/unit-tests/jobs-error-nested-make.exp
--- a/usr.bin/make/unit-tests/jobs-error-nested-make.exp        Thu Jan 07 17:28:20 2021 +0000
+++ b/usr.bin/make/unit-tests/jobs-error-nested-make.exp        Thu Jan 07 18:11:23 2021 +0000
@@ -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
diff -r 6636e57343ac -r 3f5c7b760e6a usr.bin/make/unit-tests/jobs-error-nested-make.mk
--- a/usr.bin/make/unit-tests/jobs-error-nested-make.mk Thu Jan 07 17:28:20 2021 +0000
+++ b/usr.bin/make/unit-tests/jobs-error-nested-make.mk Thu Jan 07 18:11:23 2021 +0000
@@ -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



Home | Main Index | Thread Index | Old Index