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 varmod-to-abs with...



details:   https://anonhg.NetBSD.org/src/rev/ba737a57f6c3
branches:  trunk
changeset: 946063:ba737a57f6c3
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Nov 15 05:48:17 2020 +0000

description:
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.

diffstat:

 usr.bin/make/unit-tests/varmod-to-abs.exp |  2 +-
 usr.bin/make/unit-tests/varmod-to-abs.mk  |  4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 812f6b615c4d -r ba737a57f6c3 usr.bin/make/unit-tests/varmod-to-abs.exp
--- a/usr.bin/make/unit-tests/varmod-to-abs.exp Sun Nov 15 05:43:56 2020 +0000
+++ b/usr.bin/make/unit-tests/varmod-to-abs.exp Sun Nov 15 05:48:17 2020 +0000
@@ -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
diff -r 812f6b615c4d -r ba737a57f6c3 usr.bin/make/unit-tests/varmod-to-abs.mk
--- a/usr.bin/make/unit-tests/varmod-to-abs.mk  Sun Nov 15 05:43:56 2020 +0000
+++ b/usr.bin/make/unit-tests/varmod-to-abs.mk  Sun Nov 15 05:48:17 2020 +0000
@@ -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 @@
 
 # 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
 



Home | Main Index | Thread Index | Old Index