Module Name: src
Committed By: sjg
Date: Wed Nov 18 01:06:59 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: opt.exp opt.mk
Log Message:
Always use -r -f /dev/null when not intending to read a makefile
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/opt.exp
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/opt.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/opt.exp
diff -u src/usr.bin/make/unit-tests/opt.exp:1.6 src/usr.bin/make/unit-tests/opt.exp:1.7
--- src/usr.bin/make/unit-tests/opt.exp:1.6 Sun Nov 15 06:19:34 2020
+++ src/usr.bin/make/unit-tests/opt.exp Wed Nov 18 01:06:59 2020
@@ -1,4 +1,4 @@
-make -V MAKEFLAGS
+make -r -f /dev/null -V MAKEFLAGS
-r -k -d 0
make -:
Index: src/usr.bin/make/unit-tests/opt.mk
diff -u src/usr.bin/make/unit-tests/opt.mk:1.5 src/usr.bin/make/unit-tests/opt.mk:1.6
--- src/usr.bin/make/unit-tests/opt.mk:1.5 Sun Nov 15 06:19:34 2020
+++ src/usr.bin/make/unit-tests/opt.mk Wed Nov 18 01:06:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: opt.mk,v 1.5 2020/11/15 06:19:34 rillig Exp $
+# $NetBSD: opt.mk,v 1.6 2020/11/18 01:06:59 sjg Exp $
#
# Tests for the command line options.
@@ -8,7 +8,7 @@ all: .IGNORE
# The options from the top-level make are passed to the sub-makes via
# the environment variable MAKEFLAGS. This is where the " -r -k -d 0"
# comes from. See MainParseArg.
- ${MAKE} -V MAKEFLAGS
+ ${MAKE} -r -f /dev/null -V MAKEFLAGS
@echo
# Just to see how the custom argument parsing code reacts to a syntax
