Module Name: src
Committed By: rillig
Date: Sun Nov 15 05:48:18 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: varmod-to-abs.exp varmod-to-abs.mk
Log Message:
make(1): fix test varmod-to-abs with USE_ABSOLUTE_TESTNAMES=yes
When running the tests with specifying absolute filenames, it doesn't
make sense to prefix the MAKEFILE with "./", which made the tests fail on
FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/varmod-to-abs.exp
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/varmod-to-abs.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/varmod-to-abs.exp
diff -u src/usr.bin/make/unit-tests/varmod-to-abs.exp:1.3 src/usr.bin/make/unit-tests/varmod-to-abs.exp:1.4
--- src/usr.bin/make/unit-tests/varmod-to-abs.exp:1.3 Sat Nov 14 23:03:08 2020
+++ src/usr.bin/make/unit-tests/varmod-to-abs.exp Sun Nov 15 05:48:17 2020
@@ -1,5 +1,5 @@
make: "varmod-to-abs.mk" line 18: does-not-exist.c
make: "varmod-to-abs.mk" line 19: does-not-exist.c
-cached_realpath: ./varmod-to-abs.mk -> varmod-to-abs.mk
+cached_realpath: varmod-to-abs.mk -> varmod-to-abs.mk
make: "varmod-to-abs.mk" line 23: varmod-to-abs.mk
exit status 0
Index: src/usr.bin/make/unit-tests/varmod-to-abs.mk
diff -u src/usr.bin/make/unit-tests/varmod-to-abs.mk:1.4 src/usr.bin/make/unit-tests/varmod-to-abs.mk:1.5
--- src/usr.bin/make/unit-tests/varmod-to-abs.mk:1.4 Sat Nov 14 23:03:08 2020
+++ src/usr.bin/make/unit-tests/varmod-to-abs.mk Sun Nov 15 05:48:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-to-abs.mk,v 1.4 2020/11/14 23:03:08 rillig Exp $
+# $NetBSD: varmod-to-abs.mk,v 1.5 2020/11/15 05:48:17 rillig Exp $
#
# Tests for the :tA variable modifier, which returns the absolute path for
# each of the words in the variable value.
@@ -20,7 +20,7 @@ does-not-exist.c= /dev/null
# The output of the following line is modified by the global _SED_CMDS in
# unit-tests/Makefile. See the .rawout file for the truth.
-.info ${MAKEFILE:S,^,./,:tA}
+.info ${MAKEFILE:tA}
.MAKEFLAGS: -d0
