[src/trunk]: src/usr.bin/make/unit-tests Do not allow /usr/obj to cause failure.

[sjg <sjg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/95803e094c01
branches:  trunk
changeset: 359839:95803e094c01
user:      sjg <sjg%NetBSD.org@localhost>
date:      Thu Jan 27 02:24:46 2022 +0000

description:
Do not allow /usr/obj to cause failure.

diffstat:

 usr.bin/make/unit-tests/Makefile          |  3 ++-
 usr.bin/make/unit-tests/opt-where-am-i.mk |  4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 448f35a2ed92 -r 95803e094c01 usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile  Wed Jan 26 23:00:55 2022 +0000
+++ b/usr.bin/make/unit-tests/Makefile  Thu Jan 27 02:24:46 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.300 2022/01/23 18:00:53 rillig Exp $
+# $NetBSD: Makefile,v 1.301 2022/01/27 02:24:46 sjg Exp $
 #
 # Unit tests for make(1)
 #
@@ -513,6 +513,7 @@
 SED_CMDS.opt-debug-lint+=      ${STD_SED_CMDS.regex}
 SED_CMDS.opt-jobs-no-action=   ${STD_SED_CMDS.hide-from-output}
 SED_CMDS.opt-no-action-runflags= ${STD_SED_CMDS.hide-from-output}
+SED_CMDS.opt-where-am-i=       -e '/usr.obj/d'
 # For Compat_RunCommand, useShell == false.
 SED_CMDS.sh-dots=              -e 's,^.*\.\.\.:.*,<not found: ...>,'
 # For Compat_RunCommand, useShell == true.
diff -r 448f35a2ed92 -r 95803e094c01 usr.bin/make/unit-tests/opt-where-am-i.mk
--- a/usr.bin/make/unit-tests/opt-where-am-i.mk Wed Jan 26 23:00:55 2022 +0000
+++ b/usr.bin/make/unit-tests/opt-where-am-i.mk Thu Jan 27 02:24:46 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: opt-where-am-i.mk,v 1.3 2022/01/22 17:10:51 rillig Exp $
+# $NetBSD: opt-where-am-i.mk,v 1.4 2022/01/27 02:24:46 sjg Exp $
 #
 # Tests for the -w command line option, which outputs the current directory
 # at the beginning and end of running make.  This is useful when building
@@ -10,5 +10,5 @@
 
 all:
 .if ${.CURDIR} != "/"
-       @${MAKE} -r -f ${MAKEFILE:tA} -C /
+       @MAKE_OBJDIR_CHECK_WRITABLE=no ${MAKE} -r -f ${MAKEFILE:tA} -C /
 .endif