Module Name:    src
Committed By:   rillig
Date:           Sun Aug  2 22:43:14 UTC 2020

Modified Files:
        src/usr.bin/make/unit-tests: Makefile

Log Message:
make(1): set more predictable environment for counter test

Having an environment variable or a global variable called "C" would
change the debug output since an existing variable is not set to the
empty value first.  See parse.c, keyword "!Var_Exists".


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/usr.bin/make/unit-tests/Makefile

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.81 src/usr.bin/make/unit-tests/Makefile:1.82
--- src/usr.bin/make/unit-tests/Makefile:1.81	Sun Aug  2 14:53:02 2020
+++ src/usr.bin/make/unit-tests/Makefile	Sun Aug  2 22:43:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2020/08/02 14:53:02 rillig Exp $
+# $NetBSD: Makefile,v 1.82 2020/08/02 22:43:14 rillig Exp $
 #
 # Unit tests for make(1)
 #
@@ -85,6 +85,7 @@ TESTS+=		varquote
 TESTS+=		varshell
 
 # Override environment variables for some of the tests.
+ENV.counter=		-i
 ENV.envfirst=		FROM_ENV=value-from-env
 ENV.export=		-i PATH=${PATH:Q}
 ENV.varmisc=		FROM_ENV=env
@@ -92,7 +93,7 @@ ENV.varmisc+=		FROM_ENV_BEFORE=env
 ENV.varmisc+=		FROM_ENV_AFTER=env
 
 # Override make flags for some of the tests; default is -k.
-FLAGS.counter=		-dv
+FLAGS.counter=		-r -dv
 FLAGS.doterror=		# none
 FLAGS.envfirst=		-e
 FLAGS.export=		-r

Reply via email to