[src/trunk]: src/usr.bin/make/unit-tests tests/make: fix test for option '-e'...

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

details:   https://anonhg.NetBSD.org/src/rev/0ff77459f392
branches:  trunk
changeset: 370719:0ff77459f392
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Sep 25 12:32:56 2022 +0000

description:
tests/make: fix test for option '-e' (broken since 2022-01-23)

diffstat:

 usr.bin/make/unit-tests/Makefile    |  4 ++--
 usr.bin/make/unit-tests/opt-env.exp |  6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diffs (28 lines):

diff -r 008c570548e7 -r 0ff77459f392 usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile  Sun Sep 25 12:28:54 2022 +0000
+++ b/usr.bin/make/unit-tests/Makefile  Sun Sep 25 12:32:56 2022 +0000
@@ -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 @@
 # 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
diff -r 008c570548e7 -r 0ff77459f392 usr.bin/make/unit-tests/opt-env.exp
--- a/usr.bin/make/unit-tests/opt-env.exp       Sun Sep 25 12:28:54 2022 +0000
+++ b/usr.bin/make/unit-tests/opt-env.exp       Sun Sep 25 12:32:56 2022 +0000
@@ -1,5 +1,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