Module Name: src
Committed By: rillig
Date: Sun Sep 25 12:32:57 UTC 2022
Modified Files:
src/usr.bin/make/unit-tests: Makefile opt-env.exp
Log Message:
tests/make: fix test for option '-e' (broken since 2022-01-23)
To generate a diff of this commit:
cvs rdiff -u -r1.326 -r1.327 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/opt-env.exp
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.326 src/usr.bin/make/unit-tests/Makefile:1.327
--- src/usr.bin/make/unit-tests/Makefile:1.326 Sat Sep 10 16:20:04 2022
+++ src/usr.bin/make/unit-tests/Makefile Sun Sep 25 12:32:56 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.326 2022/09/10 16:20:04 rillig Exp $
+# $NetBSD: Makefile,v 1.327 2022/09/25 12:32:56 rillig Exp $
#
# Unit tests for make(1)
#
@@ -469,7 +469,7 @@ TESTS:= ${TESTS:${BROKEN_TESTS:S,^,N,:ts
# The base environment is -i PATH="$PATH".
ENV.depsrc-optional+= TZ=UTC
ENV.directive-undef= ENV_VAR=env-value
-ENV.envfirst= FROM_ENV=value-from-env
+ENV.opt-env= FROM_ENV=value-from-env
ENV.opt-m-include-dir= ${MAKEOBJDIR:DMAKEOBJDIR=${MAKEOBJDIR}}
ENV.varmisc= FROM_ENV=env
ENV.varmisc+= FROM_ENV_BEFORE=env
Index: src/usr.bin/make/unit-tests/opt-env.exp
diff -u src/usr.bin/make/unit-tests/opt-env.exp:1.3 src/usr.bin/make/unit-tests/opt-env.exp:1.4
--- src/usr.bin/make/unit-tests/opt-env.exp:1.3 Sat Mar 26 13:32:31 2022
+++ src/usr.bin/make/unit-tests/opt-env.exp Sun Sep 25 12:32:56 2022
@@ -1,5 +1 @@
-make: "opt-env.mk" line 13: Malformed conditional (${FROM_ENV} != value-from-env)
-make: "opt-env.mk" line 20: value-from-mk
-
-make: stopped in unit-tests
-exit status 1
+exit status 0
