diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2025-04-19 20:57:00 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2025-04-19 20:59:16 +0000 |
| commit | 759b177aecbfc49ebc900739954ac56b1aa5fc53 (patch) | |
| tree | 718f466e6d539e77cf28b9dbffde7298c7036d8e /usr.bin/bmake | |
| parent | cf5f0744cd1df70f92959710bdf2a88c9f9c7df7 (diff) | |
| parent | 284d1f7d496806b18558ab55e4654fd5e96d6a3e (diff) | |
Diffstat (limited to 'usr.bin/bmake')
| -rw-r--r-- | usr.bin/bmake/Makefile.config | 2 | ||||
| -rw-r--r-- | usr.bin/bmake/unit-tests/Makefile | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/usr.bin/bmake/Makefile.config b/usr.bin/bmake/Makefile.config index a5e81a13cd0a..5a71b607ca30 100644 --- a/usr.bin/bmake/Makefile.config +++ b/usr.bin/bmake/Makefile.config @@ -6,7 +6,7 @@ SRCTOP?= ${.CURDIR:H:H} # things set by configure -_MAKE_VERSION?=20250308 +_MAKE_VERSION?=20250414 prefix?= /usr srcdir= ${SRCTOP}/contrib/bmake diff --git a/usr.bin/bmake/unit-tests/Makefile b/usr.bin/bmake/unit-tests/Makefile index cdf252d5e474..95cb31d01990 100644 --- a/usr.bin/bmake/unit-tests/Makefile +++ b/usr.bin/bmake/unit-tests/Makefile @@ -1,9 +1,9 @@ # This is a generated file, do NOT edit! # See contrib/bmake/bsd.after-import.mk # -# $Id: Makefile,v 1.230 2025/01/30 18:04:20 sjg Exp $ +# $Id: Makefile,v 1.233 2025/04/14 16:02:33 sjg Exp $ # -# $NetBSD: Makefile,v 1.355 2025/01/25 22:46:30 sjg Exp $ +# $NetBSD: Makefile,v 1.358 2025/04/13 09:29:32 rillig Exp $ # # Unit tests for make(1) # @@ -302,6 +302,9 @@ TESTS+= parse TESTS+= parse-var TESTS+= phony-end TESTS+= posix +TESTS+= posix-execution +TESTS+= posix-expansion +TESTS+= posix-varassign TESTS+= # posix1 # broken by reverting POSIX changes TESTS+= recursive TESTS+= sh @@ -612,7 +615,9 @@ SED_CMDS.opt-chdir= -e 's,\(nonexistent\).[1-9][0-9]*,\1,' \ -e 's,Filename,File name,' # meta line numbers can vary based on filemon implementation -SED_CMDS.meta-ignore= -e 's,\(\.meta:\) [1-9][0-9]*:,\1 <line>:,' +SED_CMDS.meta-ignore= -e 's,\(\.meta:\)[1-9][0-9]*:,\1<line>:,' + +SED_CMDS.opt-chdir= -e 's,\(nonexistent\).[1-9][0-9]*,\1,' SED_CMDS.opt-debug-graph1= ${STD_SED_CMDS.dg1} SED_CMDS.opt-debug-graph2= ${STD_SED_CMDS.dg2} SED_CMDS.opt-debug-graph3= ${STD_SED_CMDS.dg3} @@ -650,8 +655,8 @@ SED_CMDS.varparse-errors+= ${STD_SED_CMDS.timestamp} SED_CMDS.varname-dot-make-meta-ignore_filter+= ${SED_CMDS.meta-ignore} SED_CMDS.varname-dot-make-meta-ignore_paths+= ${SED_CMDS.meta-ignore} SED_CMDS.varname-dot-make-meta-ignore_patterns+= ${SED_CMDS.meta-ignore} -SED_CMDS.varname-dot-parsedir= -e '/in some cases/ s,^make: "[^"]*,make: "<normalized>,' -SED_CMDS.varname-dot-parsefile= -e '/in some cases/ s,^make: "[^"]*,make: "<normalized>,' +SED_CMDS.varname-dot-parsedir= -e '/in some cases/ s,^make: [^:]*:,make: <normalized>:,' +SED_CMDS.varname-dot-parsefile= -e '/in some cases/ s,^make: [^:]*:,make: <normalized>:,' SED_CMDS.varname-dot-shell= -e 's, = /[^ ]*, = (details omitted),g' SED_CMDS.varname-dot-shell+= -e 's,"/[^" ]*","(details omitted)",g' SED_CMDS.varname-dot-shell+= -e 's,\[/[^] ]*\],[(details omitted)],g' |