Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make: remove .PARSEDIR from test output of varname-empty

Browse Source 
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>".
This commit is contained in:
rillig 2021-02-04 00:16:03 +00:00
parent 844b2803e0
commit 5035af6d96
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.bin/make/unit-tests/Makefile
View File

@ -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, = /[^ ]*, = (details omitted),g'
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.

1
usr.bin/make/unit-tests/varname-empty.exp
View File

@ -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)