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(1): fix test for the MAKEFILE v...
details: https://anonhg.NetBSD.org/src/rev/d9ef0cd3f354
branches: trunk
changeset: 938243:d9ef0cd3f354
user: rillig <rillig%NetBSD.org@localhost>
date: Sat Sep 05 06:25:38 2020 +0000
description:
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.
diffstat:
usr.bin/make/unit-tests/varname-makefile.mk | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diffs (45 lines):
diff -r b654f1aeeae5 -r d9ef0cd3f354 usr.bin/make/unit-tests/varname-makefile.mk
--- a/usr.bin/make/unit-tests/varname-makefile.mk Sat Sep 05 06:20:50 2020 +0000
+++ b/usr.bin/make/unit-tests/varname-makefile.mk Sat Sep 05 06:25:38 2020 +0000
@@ -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 @@
# visible again.
#
.undef MAKEFILE
-.if ${MAKEFILE} != "varname-makefile.mk"
+.if ${MAKEFILE:T} != "varname-makefile.mk"
. error
.endif
Home |
Main Index |
Thread Index |
Old Index