[src/trunk]: src/usr.bin/make/unit-tests make(1): make test vardebug independ...

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

details:   https://anonhg.NetBSD.org/src/rev/789d19e46847
branches:  trunk
changeset: 946136:789d19e46847
user:      rillig <rillig%NetBSD.org@localhost>
date:      Tue Nov 17 20:27:35 2020 +0000

description:
make(1): make test vardebug independent from the shell

diffstat:

 usr.bin/make/unit-tests/Makefile     |  3 ++-
 usr.bin/make/unit-tests/vardebug.exp |  2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r c6ead91c7163 -r 789d19e46847 usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile  Tue Nov 17 20:19:24 2020 +0000
+++ b/usr.bin/make/unit-tests/Makefile  Tue Nov 17 20:27:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.204 2020/11/17 20:19:24 rillig Exp $
+# $NetBSD: Makefile,v 1.205 2020/11/17 20:27:35 rillig Exp $
 #
 # Unit tests for make(1)
 #
@@ -452,6 +452,7 @@
 SED_CMDS.opt-debug-jobs+=      -e 's,^\(.Command: sh\) -q,\1,'
 SED_CMDS.var-op-shell+=        -e 's,^${.SHELL:T}: [ 0-9:]*,,'
 SED_CMDS.var-op-shell+=        -e '/command/s,No such.*,not found,'
+SED_CMDS.vardebug+=    -e 's,${.SHELL},</path/to/shell>,'
 SED_CMDS.varmod-subst-regex+= \
                        -e 's,\(Regex compilation error:\).*,\1 (details omitted),'
 SED_CMDS.varmod-edge+= -e 's, line [0-9]*:, line omitted:,'
diff -r c6ead91c7163 -r 789d19e46847 usr.bin/make/unit-tests/vardebug.exp
--- a/usr.bin/make/unit-tests/vardebug.exp      Tue Nov 17 20:19:24 2020 +0000
+++ b/usr.bin/make/unit-tests/vardebug.exp      Tue Nov 17 20:27:35 2020 +0000
@@ -77,7 +77,7 @@
 Var_Parse: ${UNDEFINED} with VARE_UNDEFERR|VARE_WANTRES
 make: "vardebug.mk" line 53: Malformed conditional (${UNDEFINED})
 Global:delete .SHELL (not found)
-Command:.SHELL = /bin/sh
+Command:.SHELL = </path/to/shell>
 Command:.SHELL = overwritten ignored (read-only)
 Global:.MAKEFLAGS =  -r -k -d v -d
 Global:.MAKEFLAGS =  -r -k -d v -d 0