Module Name: src
Committed By: rillig
Date: Tue Nov 17 20:27:35 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: Makefile vardebug.exp
Log Message:
make(1): make test vardebug independent from the shell
To generate a diff of this commit:
cvs rdiff -u -r1.204 -r1.205 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/make/unit-tests/vardebug.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.204 src/usr.bin/make/unit-tests/Makefile:1.205
--- src/usr.bin/make/unit-tests/Makefile:1.204 Tue Nov 17 20:19:24 2020
+++ src/usr.bin/make/unit-tests/Makefile Tue Nov 17 20:27:35 2020
@@ -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,JobFinis
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:,'
Index: src/usr.bin/make/unit-tests/vardebug.exp
diff -u src/usr.bin/make/unit-tests/vardebug.exp:1.12 src/usr.bin/make/unit-tests/vardebug.exp:1.13
--- src/usr.bin/make/unit-tests/vardebug.exp:1.12 Sat Oct 31 18:14:59 2020
+++ src/usr.bin/make/unit-tests/vardebug.exp Tue Nov 17 20:27:35 2020
@@ -77,7 +77,7 @@ make: "vardebug.mk" line 44: Malformed c
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
