Module Name: src
Committed By: rillig
Date: Sat Sep 5 06:25:38 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: varname-makefile.mk
Log Message:
make(1): fix test for the MAKEFILE variable
That test had assumed that it would always be run with CURDIR ==
PARSEDIR, which is not the case for ./build.sh.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/varname-makefile.mk
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/varname-makefile.mk
diff -u src/usr.bin/make/unit-tests/varname-makefile.mk:1.1 src/usr.bin/make/unit-tests/varname-makefile.mk:1.2
--- src/usr.bin/make/unit-tests/varname-makefile.mk:1.1 Fri Sep 4 17:05:39 2020
+++ src/usr.bin/make/unit-tests/varname-makefile.mk Sat Sep 5 06:25:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varname-makefile.mk,v 1.1 2020/09/04 17:05:39 rillig Exp $
+# $NetBSD: varname-makefile.mk,v 1.2 2020/09/05 06:25:38 rillig Exp $
#
# Tests for the special MAKEFILE variable, which contains the current
# makefile from the -f command line option.
@@ -8,7 +8,7 @@
# Including a file via .include does not influence the MAKEFILE
# variable though.
-.if ${MAKEFILE} != "varname-makefile.mk"
+.if ${MAKEFILE:T} != "varname-makefile.mk"
. error
.endif
@@ -20,7 +20,7 @@
# namespace.
#
.undef MAKEFILE
-.if ${MAKEFILE} != "varname-makefile.mk"
+.if ${MAKEFILE:T} != "varname-makefile.mk"
. error
.endif
@@ -28,7 +28,7 @@
# serves as a fallback for the "Global" namespace (see VarFind).
#
MAKEFILE= overwritten
-.if ${MAKEFILE} != "overwritten"
+.if ${MAKEFILE:T} != "overwritten"
. error
.endif
@@ -36,7 +36,7 @@ MAKEFILE= overwritten
# visible again.
#
.undef MAKEFILE
-.if ${MAKEFILE} != "varname-makefile.mk"
+.if ${MAKEFILE:T} != "varname-makefile.mk"
. error
.endif
