Module Name: src
Committed By: rillig
Date: Thu Feb 4 00:16:03 UTC 2021
Modified Files:
src/usr.bin/make/unit-tests: Makefile varname-empty.exp
Log Message:
make: remove .PARSEDIR from test output of varname-empty
The .PARSEDIR has nothing to do with .CURDIR. This wrong assumption
made the NetBSD test suite fail since the actual .PARSEDIR was not
replaced with "<curdir>".
To generate a diff of this commit:
cvs rdiff -u -r1.267 -r1.268 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/varname-empty.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.267 src/usr.bin/make/unit-tests/Makefile:1.268
--- src/usr.bin/make/unit-tests/Makefile:1.267 Wed Feb 3 08:34:15 2021
+++ src/usr.bin/make/unit-tests/Makefile Thu Feb 4 00:16:03 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.267 2021/02/03 08:34:15 rillig Exp $
+# $NetBSD: Makefile,v 1.268 2021/02/04 00:16:03 rillig Exp $
#
# Unit tests for make(1)
#
@@ -520,6 +520,7 @@ SED_CMDS.varname-dot-shell= -e 's, = /[^
SED_CMDS.varname-dot-shell+= -e 's,"/[^" ]*","(details omitted)",g'
SED_CMDS.varname-dot-shell+= -e 's,\[/[^] ]*\],[(details omitted)],g'
SED_CMDS.varname-empty= -e 's,${.CURDIR},<curdir>,g'
+SED_CMDS.varname-empty+= -e '/\.PARSEDIR/d'
SED_CMDS.varname-empty+= -e '/\.SHELL/d'
# Some tests need an additional round of postprocessing.
Index: src/usr.bin/make/unit-tests/varname-empty.exp
diff -u src/usr.bin/make/unit-tests/varname-empty.exp:1.7 src/usr.bin/make/unit-tests/varname-empty.exp:1.8
--- src/usr.bin/make/unit-tests/varname-empty.exp:1.7 Wed Feb 3 08:40:47 2021
+++ src/usr.bin/make/unit-tests/varname-empty.exp Thu Feb 4 00:16:03 2021
@@ -14,7 +14,6 @@ Global:.PATH = . <curdir>
Global:.TARGETS =
Internal:MAKEFILE = varname-empty.mk
Global:.MAKE.MAKEFILES = varname-empty.mk
-Global:.PARSEDIR = <curdir>
Global:.PARSEFILE = varname-empty.mk
Global:delete .INCLUDEDFROMDIR (not found)
Global:delete .INCLUDEDFROMFILE (not found)
