aboutsummaryrefslogtreecommitdiff
path: root/unit-tests/parse.mk
diff options
context:
space:
mode:
authorSimon J. Gerraty <sjg@FreeBSD.org>2025-07-19 17:08:57 +0000
committerSimon J. Gerraty <sjg@FreeBSD.org>2025-07-19 17:08:57 +0000
commit3d772e596c1acf76f555c1f51fd8d834e56b0c35 (patch)
treedec8bea55fcfd356463e0d9b3b45fb75f1c60204 /unit-tests/parse.mk
parent4f8f2bc2946615330eaa2cc1f6b37d97865fa58a (diff)
Import bmake-20250707vendor/NetBSD/bmake/20250707
Intersting/relevant changes since bmake-20250618 ChangeLog since bmake-20250618 2025-07-07 Simon J Gerraty <sjg@beast.crufty.net> * VERSION (_MAKE_VERSION): 20250707 Merge with NetBSD make, pick up o cond.c: improve debug log message for 'exists' function. complain about unfinished escape sequences or string literals. 2025-07-04 Simon J Gerraty <sjg@beast.crufty.net> * VERSION (_MAKE_VERSION): 20250704 Merge with NetBSD make, pick up o make.1: add a DIAGNOSTICS section for make to reference. o main.c: simplify the warning for invalid -J by refering to manual page. 2025-06-30 Simon J Gerraty <sjg@beast.crufty.net> * VERSION (_MAKE_VERSION): 20250630 Merge with NetBSD make, pick up o consistently use double quotes in error messages o cond.c: if a condition is erroneous, skip the whole .if/.endif o make_malloc.c: in cleanup mode, initialize freshly allocated memory o str.c: error out on an ":M" modifier whose pattern ends with backslash o var.c: fix parsing of modifier parts for :gmtime and :localtime add POSIX $^ support mk/ChangeLog since bmake-20250618 2025-07-04 Simon J Gerraty <sjg@beast.crufty.net> * prog.mk: .MADE is a special source not a target!
Diffstat (limited to 'unit-tests/parse.mk')
-rw-r--r--unit-tests/parse.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/unit-tests/parse.mk b/unit-tests/parse.mk
index 80a51f2de11e..fb959a4a5e1b 100644
--- a/unit-tests/parse.mk
+++ b/unit-tests/parse.mk
@@ -1,16 +1,16 @@
-# $NetBSD: parse.mk,v 1.7 2023/08/19 11:09:02 rillig Exp $
+# $NetBSD: parse.mk,v 1.8 2025/06/28 22:39:29 rillig Exp $
#
# Test those parts of the parsing that do not belong in any of the other
# categories.
-# expect+1: Invalid line '<<<<<< old'
+# expect+1: Invalid line "<<<<<< old"
<<<<<< old
# No diagnostic since the following line is parsed as a variable assignment,
# even though the variable name is empty. See also varname-empty.mk.
====== middle
-# expect+1: Invalid line '>>>>>> new'
+# expect+1: Invalid line ">>>>>> new"
>>>>>> new
@@ -21,7 +21,7 @@
# the expanded line's terminating '\0'.
#
# https://bugs.freebsd.org/265119
-# expect+1: Invalid line 'one-target ${:U }', expanded to 'one-target '
+# expect+1: Invalid line "one-target ${:U }", expanded to "one-target "
one-target ${:U }