Module Name: src
Committed By: sjg
Date: Thu Jan 27 02:24:46 UTC 2022
Modified Files:
src/usr.bin/make/unit-tests: Makefile opt-where-am-i.mk
Log Message:
Do not allow /usr/obj to cause failure.
To generate a diff of this commit:
cvs rdiff -u -r1.300 -r1.301 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/opt-where-am-i.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/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.300 src/usr.bin/make/unit-tests/Makefile:1.301
--- src/usr.bin/make/unit-tests/Makefile:1.300 Sun Jan 23 18:00:53 2022
+++ src/usr.bin/make/unit-tests/Makefile Thu Jan 27 02:24:46 2022
@@ -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-jobs+= -e 's,^\(.Comm
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.
Index: src/usr.bin/make/unit-tests/opt-where-am-i.mk
diff -u src/usr.bin/make/unit-tests/opt-where-am-i.mk:1.3 src/usr.bin/make/unit-tests/opt-where-am-i.mk:1.4
--- src/usr.bin/make/unit-tests/opt-where-am-i.mk:1.3 Sat Jan 22 17:10:51 2022
+++ src/usr.bin/make/unit-tests/opt-where-am-i.mk Thu Jan 27 02:24:46 2022
@@ -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
