Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/make/unit-tests make: remove .PARSEDIR from test out...
details: https://anonhg.NetBSD.org/src/rev/8ecfbafef7a0
branches: trunk
changeset: 959192:8ecfbafef7a0
user: rillig <rillig%NetBSD.org@localhost>
date: Thu Feb 04 00:16:03 2021 +0000
description:
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>".
diffstat:
usr.bin/make/unit-tests/Makefile | 3 ++-
usr.bin/make/unit-tests/varname-empty.exp | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diffs (28 lines):
diff -r fb351158eb85 -r 8ecfbafef7a0 usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile Wed Feb 03 23:26:08 2021 +0000
+++ b/usr.bin/make/unit-tests/Makefile Thu Feb 04 00:16:03 2021 +0000
@@ -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-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.
diff -r fb351158eb85 -r 8ecfbafef7a0 usr.bin/make/unit-tests/varname-empty.exp
--- a/usr.bin/make/unit-tests/varname-empty.exp Wed Feb 03 23:26:08 2021 +0000
+++ b/usr.bin/make/unit-tests/varname-empty.exp Thu Feb 04 00:16:03 2021 +0000
@@ -14,7 +14,6 @@
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)
Home |
Main Index |
Thread Index |
Old Index