git: 759b177aecbf - main - Merge bmake-20250414

From: Simon J. Gerraty <sjg_at_FreeBSD.org>
Date: Sat, 19 Apr 2025 21:00:18 UTC
The branch main has been updated by sjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=759b177aecbfc49ebc900739954ac56b1aa5fc53

commit 759b177aecbfc49ebc900739954ac56b1aa5fc53
Merge: cf5f0744cd1d 284d1f7d4968
Author:     Simon J. Gerraty <sjg@FreeBSD.org>
AuthorDate: 2025-04-19 20:57:00 +0000
Commit:     Simon J. Gerraty <sjg@FreeBSD.org>
CommitDate: 2025-04-19 20:59:16 +0000

    Merge bmake-20250414
    
    Merge commit '284d1f7d496806b18558ab55e4654fd5e96d6a3e'

 contrib/bmake/ChangeLog                            |  49 ++++++
 contrib/bmake/FILES                                |   6 +
 contrib/bmake/VERSION                              |   2 +-
 contrib/bmake/bmake.1                              |  58 ++++++-
 contrib/bmake/bmake.cat1                           |  41 ++++-
 contrib/bmake/cond.c                               |  32 ++--
 contrib/bmake/dir.c                                |   6 +-
 contrib/bmake/for.c                                |  47 +++---
 contrib/bmake/job.c                                |  38 ++---
 contrib/bmake/main.c                               |  15 +-
 contrib/bmake/make.1                               |  58 ++++++-
 contrib/bmake/make.h                               |   5 +-
 contrib/bmake/meta.c                               |  32 ++--
 contrib/bmake/mk/ChangeLog                         |  22 +++
 contrib/bmake/mk/auto.obj.mk                       |  13 +-
 contrib/bmake/mk/genfiles.mk                       |   5 +-
 contrib/bmake/mk/init.mk                           |  21 ++-
 contrib/bmake/mk/install-mk                        |   4 +-
 contrib/bmake/mk/rst2htm.mk                        |   6 +-
 contrib/bmake/parse.c                              |  22 +--
 contrib/bmake/unit-tests/Makefile                  |  15 +-
 contrib/bmake/unit-tests/archive.exp               |   4 +-
 contrib/bmake/unit-tests/cmd-errors-jobs.exp       |  10 +-
 contrib/bmake/unit-tests/cmd-errors-jobs.mk        |   9 +-
 contrib/bmake/unit-tests/cmd-errors-lint.exp       |   5 +-
 contrib/bmake/unit-tests/cmd-errors-lint.mk        |   4 +-
 contrib/bmake/unit-tests/cmd-errors.exp            |   5 +-
 contrib/bmake/unit-tests/cmd-errors.mk             |   4 +-
 contrib/bmake/unit-tests/cmdline-undefined.exp     |  24 +--
 contrib/bmake/unit-tests/cond-cmp-numeric-eq.exp   |   4 +-
 contrib/bmake/unit-tests/cond-cmp-numeric.exp      |   8 +-
 contrib/bmake/unit-tests/cond-cmp-string.exp       |  16 +-
 contrib/bmake/unit-tests/cond-cmp-unary.exp        |   2 +-
 contrib/bmake/unit-tests/cond-eof.exp              |   6 +-
 contrib/bmake/unit-tests/cond-func-defined.exp     |   4 +-
 contrib/bmake/unit-tests/cond-func-empty.exp       |   2 +-
 contrib/bmake/unit-tests/cond-func-make.exp        |   2 +-
 contrib/bmake/unit-tests/cond-func.exp             |  20 +--
 contrib/bmake/unit-tests/cond-late.exp             |   2 +-
 contrib/bmake/unit-tests/cond-op-and-lint.exp      |   2 +-
 contrib/bmake/unit-tests/cond-op-and.exp           |  16 +-
 contrib/bmake/unit-tests/cond-op-not.exp           |  12 +-
 contrib/bmake/unit-tests/cond-op-or-lint.exp       |   2 +-
 contrib/bmake/unit-tests/cond-op-or.exp            |  16 +-
 contrib/bmake/unit-tests/cond-op-parentheses.exp   |   8 +-
 contrib/bmake/unit-tests/cond-op.exp               |  36 ++---
 contrib/bmake/unit-tests/cond-short.exp            |   2 +-
 contrib/bmake/unit-tests/cond-token-number.exp     |   8 +-
 contrib/bmake/unit-tests/cond-token-plain.exp      |  30 ++--
 contrib/bmake/unit-tests/cond-token-string.exp     |  18 +--
 contrib/bmake/unit-tests/cond-token-string.mk      |   4 +-
 contrib/bmake/unit-tests/cond-token-var.exp        |  26 +--
 contrib/bmake/unit-tests/cond-token-var.mk         |  29 +++-
 contrib/bmake/unit-tests/cond-undef-lint.exp       |   6 +-
 .../bmake/unit-tests/dep-colon-bug-cross-file.exp  |   4 +-
 contrib/bmake/unit-tests/dep-duplicate.exp         |   4 +-
 contrib/bmake/unit-tests/dep-op-missing.exp        |   2 +-
 contrib/bmake/unit-tests/dep.exp                   |   4 +-
 contrib/bmake/unit-tests/deptgt-begin.exp          |   4 +-
 contrib/bmake/unit-tests/deptgt-path-suffix.exp    |   2 +-
 contrib/bmake/unit-tests/deptgt.exp                |  14 +-
 contrib/bmake/unit-tests/deptgt.mk                 |   6 +-
 contrib/bmake/unit-tests/directive-dinclude.exp    |   2 +-
 contrib/bmake/unit-tests/directive-dinclude.mk     |   4 +-
 contrib/bmake/unit-tests/directive-elif.exp        |  36 ++---
 contrib/bmake/unit-tests/directive-else.exp        |  16 +-
 contrib/bmake/unit-tests/directive-endfor.exp      |   2 +-
 contrib/bmake/unit-tests/directive-endif.exp       |  10 +-
 contrib/bmake/unit-tests/directive-error.exp       |   2 +-
 .../bmake/unit-tests/directive-export-gmake.exp    |   6 +-
 contrib/bmake/unit-tests/directive-export.exp      |   8 +-
 contrib/bmake/unit-tests/directive-for-break.exp   |   4 +-
 contrib/bmake/unit-tests/directive-for-empty.exp   |   2 +-
 contrib/bmake/unit-tests/directive-for-errors.exp  |  25 ++-
 contrib/bmake/unit-tests/directive-for-errors.mk   |  14 +-
 contrib/bmake/unit-tests/directive-for-escape.exp  |  66 ++++----
 .../unit-tests/directive-for-generating-endif.exp  |   8 +-
 contrib/bmake/unit-tests/directive-for-if.exp      |   6 +-
 contrib/bmake/unit-tests/directive-for-lines.exp   |  12 +-
 contrib/bmake/unit-tests/directive-for-null.exp    |   2 +-
 contrib/bmake/unit-tests/directive-for-null.mk     |   4 +-
 contrib/bmake/unit-tests/directive-for.exp         |  59 ++++---
 contrib/bmake/unit-tests/directive-for.mk          |  14 +-
 .../bmake/unit-tests/directive-hyphen-include.exp  |   2 +-
 .../bmake/unit-tests/directive-hyphen-include.mk   |   4 +-
 contrib/bmake/unit-tests/directive-if-nested.exp   |   2 +-
 contrib/bmake/unit-tests/directive-if.exp          |  30 ++--
 contrib/bmake/unit-tests/directive-ifmake.exp      |  14 +-
 contrib/bmake/unit-tests/directive-ifndef.exp      |   2 +-
 .../bmake/unit-tests/directive-include-fatal.exp   |   2 +-
 .../bmake/unit-tests/directive-include-guard.exp   | 168 +++++++++----------
 .../bmake/unit-tests/directive-include-guard.mk    | 168 +++++++++----------
 contrib/bmake/unit-tests/directive-include.exp     |  12 +-
 contrib/bmake/unit-tests/directive-include.mk      |   6 +-
 contrib/bmake/unit-tests/directive-info.exp        |  24 +--
 .../bmake/unit-tests/directive-misspellings.exp    |  84 +++++-----
 contrib/bmake/unit-tests/directive-sinclude.exp    |   2 +-
 contrib/bmake/unit-tests/directive-sinclude.mk     |   4 +-
 contrib/bmake/unit-tests/directive-undef.exp       |   6 +-
 contrib/bmake/unit-tests/directive-undef.mk        |   4 +-
 .../bmake/unit-tests/directive-unexport-env.exp    |   6 +-
 contrib/bmake/unit-tests/directive-unexport.exp    |   8 +-
 contrib/bmake/unit-tests/directive-warning.exp     |  16 +-
 contrib/bmake/unit-tests/directive.exp             |  14 +-
 contrib/bmake/unit-tests/error.exp                 |   6 +-
 contrib/bmake/unit-tests/include-main.exp          |  18 +--
 contrib/bmake/unit-tests/lint.exp                  |   1 +
 contrib/bmake/unit-tests/meta-cmd-cmp.exp          |  12 +-
 contrib/bmake/unit-tests/moderrs.exp               | 117 +++++++++-----
 contrib/bmake/unit-tests/moderrs.mk                |  69 ++++----
 contrib/bmake/unit-tests/opt-debug-file.exp        |   6 +-
 contrib/bmake/unit-tests/opt-debug-hash.exp        |   2 +-
 contrib/bmake/unit-tests/opt-debug-lint.exp        |  10 +-
 contrib/bmake/unit-tests/opt-debug-lint.mk         |   8 +-
 contrib/bmake/unit-tests/opt-debug-parse.exp       |  18 +--
 contrib/bmake/unit-tests/opt-debug-var.exp         |   4 +-
 contrib/bmake/unit-tests/opt-file.exp              |   2 +-
 .../bmake/unit-tests/opt-warnings-as-errors.exp    |   4 +-
 contrib/bmake/unit-tests/parse.exp                 |   6 +-
 contrib/bmake/unit-tests/posix-execution.exp       |  24 +++
 contrib/bmake/unit-tests/posix-execution.mk        |  59 +++++++
 contrib/bmake/unit-tests/posix-expansion.exp       |   1 +
 contrib/bmake/unit-tests/posix-expansion.mk        |  22 +++
 contrib/bmake/unit-tests/posix-varassign.exp       |   1 +
 contrib/bmake/unit-tests/posix-varassign.mk        |  79 +++++++++
 contrib/bmake/unit-tests/posix.exp                 |  28 +---
 contrib/bmake/unit-tests/posix.mk                  |  36 ++---
 contrib/bmake/unit-tests/recursive.exp             |   4 +-
 contrib/bmake/unit-tests/var-eval-short.exp        |   2 +-
 contrib/bmake/unit-tests/var-op-assign.exp         |   4 +-
 contrib/bmake/unit-tests/var-op-expand.exp         |   8 +-
 contrib/bmake/unit-tests/var-op-expand.mk          |   6 +-
 contrib/bmake/unit-tests/var-op-shell.exp          |   8 +-
 contrib/bmake/unit-tests/var-recursive.exp         |  19 +--
 contrib/bmake/unit-tests/var-recursive.mk          |   8 +-
 contrib/bmake/unit-tests/var-scope-cmdline.exp     |   4 +-
 contrib/bmake/unit-tests/vardebug.exp              |   5 +-
 contrib/bmake/unit-tests/vardebug.mk               |   7 +-
 contrib/bmake/unit-tests/varmisc.exp               |   9 ++
 contrib/bmake/unit-tests/varmod-assign-shell.exp   |   4 +-
 contrib/bmake/unit-tests/varmod-assign.exp         |  18 ++-
 contrib/bmake/unit-tests/varmod-assign.mk          |  20 ++-
 contrib/bmake/unit-tests/varmod-edge.exp           |  15 +-
 contrib/bmake/unit-tests/varmod-edge.mk            |  13 +-
 contrib/bmake/unit-tests/varmod-gmtime.exp         |  10 +-
 contrib/bmake/unit-tests/varmod-hash.exp           |   9 +-
 contrib/bmake/unit-tests/varmod-ifelse.exp         |  46 +++---
 contrib/bmake/unit-tests/varmod-ifelse.mk          |  16 +-
 contrib/bmake/unit-tests/varmod-indirect.exp       |  36 ++---
 contrib/bmake/unit-tests/varmod-indirect.mk        |  23 ++-
 contrib/bmake/unit-tests/varmod-localtime.exp      |  10 +-
 contrib/bmake/unit-tests/varmod-loop-delete.exp    |   2 +-
 contrib/bmake/unit-tests/varmod-loop-varname.exp   |   8 +-
 contrib/bmake/unit-tests/varmod-match-escape.exp   |   8 +-
 contrib/bmake/unit-tests/varmod-match.exp          |  20 +--
 contrib/bmake/unit-tests/varmod-match.mk           |   4 +-
 contrib/bmake/unit-tests/varmod-mtime.exp          |  12 +-
 contrib/bmake/unit-tests/varmod-mtime.mk           |   4 +-
 contrib/bmake/unit-tests/varmod-order.exp          |  26 ++-
 contrib/bmake/unit-tests/varmod-order.mk           |  28 ++--
 contrib/bmake/unit-tests/varmod-range.exp          |  13 +-
 contrib/bmake/unit-tests/varmod-range.mk           |  12 +-
 contrib/bmake/unit-tests/varmod-select-words.exp   |  36 +++--
 contrib/bmake/unit-tests/varmod-select-words.mk    |  26 +--
 contrib/bmake/unit-tests/varmod-shell.exp          |   6 +-
 contrib/bmake/unit-tests/varmod-subst-regex.exp    |  17 +-
 contrib/bmake/unit-tests/varmod-subst.exp          |   3 +-
 contrib/bmake/unit-tests/varmod-subst.mk           |   4 +-
 contrib/bmake/unit-tests/varmod-sun-shell.exp      |   4 +-
 contrib/bmake/unit-tests/varmod-sysv.exp           |   4 +-
 contrib/bmake/unit-tests/varmod-sysv.mk            |  29 +++-
 contrib/bmake/unit-tests/varmod-to-abs.exp         |   6 +-
 contrib/bmake/unit-tests/varmod-to-separator.exp   |  26 +--
 contrib/bmake/unit-tests/varmod-to-separator.mk    |  80 ++++-----
 contrib/bmake/unit-tests/varmod.exp                |  47 +++---
 contrib/bmake/unit-tests/varmod.mk                 |  91 ++++++-----
 contrib/bmake/unit-tests/varname-dollar.exp        |   8 +-
 .../bmake/unit-tests/varname-dot-make-level.exp    |  13 +-
 contrib/bmake/unit-tests/varname-dot-make-level.mk |  42 ++++-
 .../varname-dot-make-meta-ignore_filter.exp        |   2 +-
 .../varname-dot-make-meta-ignore_paths.exp         |   2 +-
 .../varname-dot-make-meta-ignore_patterns.exp      |   2 +-
 contrib/bmake/unit-tests/varname-dot-makeflags.exp |  12 +-
 contrib/bmake/unit-tests/varname-dot-newline.exp   |   6 +-
 contrib/bmake/unit-tests/varname-dot-parsedir.exp  |   6 +-
 contrib/bmake/unit-tests/varname-dot-parsefile.exp |   6 +-
 contrib/bmake/unit-tests/varname.exp               |   6 +-
 contrib/bmake/unit-tests/varparse-dynamic.exp      |   4 +-
 contrib/bmake/unit-tests/varparse-errors.exp       |  47 +++---
 contrib/bmake/unit-tests/varparse-errors.mk        |  34 +++-
 contrib/bmake/var.c                                | 178 ++++++++++-----------
 usr.bin/bmake/Makefile.config                      |   2 +-
 usr.bin/bmake/unit-tests/Makefile                  |  15 +-
 193 files changed, 2032 insertions(+), 1469 deletions(-)

diff --cc contrib/bmake/mk/install-mk
index d765fbba2251,de5056a37042..de5056a37042
mode 100644,100755..100755
--- a/contrib/bmake/mk/install-mk
+++ b/contrib/bmake/mk/install-mk
diff --cc contrib/bmake/unit-tests/posix-execution.exp
index 000000000000,e455adaf98d7..e455adaf98d7
mode 000000,100644..100644
--- a/contrib/bmake/unit-tests/posix-execution.exp
+++ b/contrib/bmake/unit-tests/posix-execution.exp
diff --cc contrib/bmake/unit-tests/posix-execution.mk
index 000000000000,ef4a66d84102..ef4a66d84102
mode 000000,100644..100644
--- a/contrib/bmake/unit-tests/posix-execution.mk
+++ b/contrib/bmake/unit-tests/posix-execution.mk
diff --cc contrib/bmake/unit-tests/posix-expansion.exp
index 000000000000,39a9383953dd..39a9383953dd
mode 000000,100644..100644
--- a/contrib/bmake/unit-tests/posix-expansion.exp
+++ b/contrib/bmake/unit-tests/posix-expansion.exp
diff --cc contrib/bmake/unit-tests/posix-expansion.mk
index 000000000000,59082d567b37..59082d567b37
mode 000000,100644..100644
--- a/contrib/bmake/unit-tests/posix-expansion.mk
+++ b/contrib/bmake/unit-tests/posix-expansion.mk
diff --cc contrib/bmake/unit-tests/posix-varassign.exp
index 000000000000,39a9383953dd..39a9383953dd
mode 000000,100644..100644
--- a/contrib/bmake/unit-tests/posix-varassign.exp
+++ b/contrib/bmake/unit-tests/posix-varassign.exp
diff --cc contrib/bmake/unit-tests/posix-varassign.mk
index 000000000000,6b9b2f083e3e..6b9b2f083e3e
mode 000000,100644..100644
--- a/contrib/bmake/unit-tests/posix-varassign.mk
+++ b/contrib/bmake/unit-tests/posix-varassign.mk
diff --cc usr.bin/bmake/Makefile.config
index a5e81a13cd0a,000000000000..5a71b607ca30
mode 100644,000000..100644
--- a/usr.bin/bmake/Makefile.config
+++ b/usr.bin/bmake/Makefile.config
@@@ -1,28 -1,0 +1,28 @@@
 +# This is a generated file, do NOT edit!
 +# See contrib/bmake/bsd.after-import.mk
 +#
 +
 +SRCTOP?= ${.CURDIR:H:H}
 +
 +# things set by configure
 +
- _MAKE_VERSION?=20250308
++_MAKE_VERSION?=20250414
 +
 +prefix?= /usr
 +srcdir= ${SRCTOP}/contrib/bmake
 +CC?= cc
 +MAKE_OS?= 
 +DEFAULT_SYS_PATH?= .../share/mk:/usr/share/mk
 +
 +EGREP= egrep
 +CPPFLAGS+= 
 +CFLAGS+= ${CPPFLAGS} -DHAVE_CONFIG_H
 +LDFLAGS+= 
 +LIBOBJS+=  ${LIBOBJDIR}stresep$U.o
 +LDADD+= 
 +USE_META?= yes
 +USE_FILEMON?= dev
 +FILEMON_H?= /usr/include/dev/filemon/filemon.h
 +BMAKE_PATH_MAX?= 1024
 +# used if MAXPATHLEN not defined
 +CPPFLAGS+= -DBMAKE_PATH_MAX=${BMAKE_PATH_MAX}
diff --cc usr.bin/bmake/unit-tests/Makefile
index cdf252d5e474,000000000000..95cb31d01990
mode 100644,000000..100644
--- a/usr.bin/bmake/unit-tests/Makefile
+++ b/usr.bin/bmake/unit-tests/Makefile
@@@ -1,918 -1,0 +1,923 @@@
 +# 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)
 +#
 +# The main targets are:
 +#
 +# all:
 +#	run all the tests
 +# test:
 +#	run 'all', and compare to expected results
 +# accept:
 +#	move generated output to expected results
 +#
 +# Settable variables
 +#
 +# TEST_MAKE
 +#	The make program to be tested.
 +#
 +#
 +# Adding a test case
 +#
 +# Each feature should get its own set of tests in its own suitably
 +# named makefile (*.mk), with its own set of expected results (*.exp),
 +# and it should be added to the TESTS list.
 +#
 +
 +.MAIN: all
 +
 +# we use these below but we might be an older make
 +.MAKE.OS?= ${uname -s:L:sh}
 +.MAKE.UID?= ${id -u:L:sh}
 +
 +# for many tests we need a TMPDIR that will not collide
 +# with other users.
 +.if ${.OBJDIR} != ${.CURDIR}
 +# easy
 +TMPDIR:=	${.OBJDIR}/tmp
 +.elif defined(TMPDIR)
 +TMPDIR:=	${TMPDIR}/uid${.MAKE.UID}
 +.else
 +TMPDIR:=	/tmp/uid${.MAKE.UID}
 +.endif
 +# make sure it exists
 +.if !exist(${TMPDIR})
 +_!= mkdir -p ${TMPDIR}
 +.endif
 +# and clean it up - outside the context of
 +# any target that might be using it.
 +.END: rm-tmpdir
 +rm-tmpdir:	.NOMETA
 +	@rm -rf ${TMPDIR}
 +
 +# Each test is in a sub-makefile.
 +# Keep the list sorted.
 +# Any test that is commented out must be ignored in
 +# src/tests/usr.bin/make/t_make.sh as well.
 +#TESTS+=		archive
 +#TESTS+=		archive-suffix
 +TESTS+=		cmd-errors
 +TESTS+=		cmd-errors-jobs
 +TESTS+=		cmd-errors-lint
 +TESTS+=		cmd-interrupt
 +TESTS+=		cmdline
 +TESTS+=		cmdline-redirect-stdin
 +TESTS+=		cmdline-undefined
 +TESTS+=		comment
 +TESTS+=		compat-error
 +TESTS+=		cond-cmp-numeric
 +TESTS+=		cond-cmp-numeric-eq
 +TESTS+=		cond-cmp-numeric-ge
 +TESTS+=		cond-cmp-numeric-gt
 +TESTS+=		cond-cmp-numeric-le
 +TESTS+=		cond-cmp-numeric-lt
 +TESTS+=		cond-cmp-numeric-ne
 +TESTS+=		cond-cmp-string
 +TESTS+=		cond-cmp-unary
 +TESTS+=		cond-eof
 +TESTS+=		cond-func
 +TESTS+=		cond-func-commands
 +TESTS+=		cond-func-defined
 +TESTS+=		cond-func-empty
 +TESTS+=		cond-func-exists
 +TESTS+=		cond-func-make
 +TESTS+=		cond-func-make-main
 +TESTS+=		cond-func-target
 +TESTS+=		cond-late
 +TESTS+=		cond-op
 +TESTS+=		cond-op-and
 +TESTS+=		cond-op-and-lint
 +TESTS+=		cond-op-not
 +TESTS+=		cond-op-or
 +TESTS+=		cond-op-or-lint
 +TESTS+=		cond-op-parentheses
 +TESTS+=		cond-short
 +TESTS+=		cond-token-number
 +TESTS+=		cond-token-plain
 +TESTS+=		cond-token-string
 +TESTS+=		cond-token-var
 +TESTS+=		cond-undef-lint
 +TESTS+=		counter
 +TESTS+=		counter-append
 +TESTS+=		dep
 +TESTS+=		dep-colon
 +TESTS+=		dep-colon-bug-cross-file
 +TESTS+=		dep-double-colon
 +TESTS+=		dep-double-colon-indep
 +TESTS+=		dep-duplicate
 +TESTS+=		dep-exclam
 +TESTS+=		dep-none
 +TESTS+=		dep-op-missing
 +TESTS+=		dep-percent
 +TESTS+=		dep-var
 +TESTS+=		dep-wildcards
 +TESTS+=		depsrc
 +TESTS+=		depsrc-end
 +TESTS+=		depsrc-exec
 +TESTS+=		depsrc-ignore
 +TESTS+=		depsrc-made
 +TESTS+=		depsrc-make
 +TESTS+=		depsrc-meta
 +TESTS+=		depsrc-nometa
 +TESTS+=		depsrc-nometa_cmp
 +TESTS+=		depsrc-nopath
 +TESTS+=		depsrc-notmain
 +TESTS+=		depsrc-optional
 +TESTS+=		depsrc-phony
 +TESTS+=		depsrc-precious
 +TESTS+=		depsrc-recursive
 +TESTS+=		depsrc-silent
 +TESTS+=		depsrc-use
 +TESTS+=		depsrc-usebefore
 +TESTS+=		depsrc-usebefore-double-colon
 +TESTS+=		depsrc-wait
 +TESTS+=		deptgt
 +TESTS+=		deptgt-begin
 +TESTS+=		deptgt-begin-fail
 +TESTS+=		deptgt-begin-fail-indirect
 +TESTS+=		deptgt-default
 +TESTS+=		deptgt-delete_on_error
 +TESTS+=		deptgt-end
 +TESTS+=		deptgt-end-fail
 +TESTS+=		deptgt-end-fail-all
 +TESTS+=		deptgt-end-fail-indirect
 +TESTS+=		deptgt-end-jobs
 +TESTS+=		deptgt-error
 +TESTS+=		deptgt-ignore
 +TESTS+=		deptgt-interrupt
 +TESTS+=		deptgt-main
 +TESTS+=		deptgt-makeflags
 +TESTS+=		deptgt-no_parallel
 +TESTS+=		deptgt-nopath
 +TESTS+=		deptgt-notparallel
 +TESTS+=		deptgt-objdir
 +TESTS+=		deptgt-order
 +TESTS+=		deptgt-path
 +TESTS+=		deptgt-path-suffix
 +TESTS+=		deptgt-phony
 +TESTS+=		deptgt-posix
 +TESTS+=		deptgt-precious
 +TESTS+=		deptgt-shell
 +TESTS+=		deptgt-silent
 +TESTS+=		deptgt-silent-jobs
 +TESTS+=		deptgt-stale
 +TESTS+=		deptgt-suffixes
 +TESTS+=		dir
 +TESTS+=		dir-expand-path
 +TESTS+=		directive
 +TESTS+=		directive-dinclude
 +TESTS+=		directive-elif
 +TESTS+=		directive-elifdef
 +TESTS+=		directive-elifmake
 +TESTS+=		directive-elifndef
 +TESTS+=		directive-elifnmake
 +TESTS+=		directive-else
 +TESTS+=		directive-endfor
 +TESTS+=		directive-endif
 +TESTS+=		directive-error
 +TESTS+=		directive-export
 +TESTS+=		directive-export-env
 +TESTS+=		directive-export-impl
 +TESTS+=		directive-export-gmake
 +TESTS+=		directive-export-literal
 +TESTS+=		directive-for
 +TESTS+=		directive-for-break
 +TESTS+=		directive-for-empty
 +TESTS+=		directive-for-errors
 +TESTS+=		directive-for-escape
 +TESTS+=		directive-for-generating-endif
 +TESTS+=		directive-for-if
 +TESTS+=		directive-for-lines
 +TESTS+=		directive-for-null
 +TESTS+=		directive-hyphen-include
 +TESTS+=		directive-if
 +TESTS+=		directive-if-nested
 +TESTS+=		directive-ifdef
 +TESTS+=		directive-ifmake
 +TESTS+=		directive-ifndef
 +TESTS+=		directive-ifnmake
 +TESTS+=		directive-include
 +TESTS+=		directive-include-fatal
 +TESTS+=		directive-include-guard
 +TESTS+=		directive-info
 +TESTS+=		directive-misspellings
 +TESTS+=		directive-sinclude
 +TESTS+=		directive-undef
 +TESTS+=		directive-unexport
 +TESTS+=		directive-unexport-env
 +TESTS+=		directive-warning
 +TESTS+=		dollar
 +TESTS+=		doterror
 +TESTS+=		dotwait
 +TESTS+=		error
 +TESTS+=		# escape	# broken by reverting POSIX changes
 +TESTS+=		export
 +TESTS+=		export-all
 +TESTS+=		export-env
 +TESTS+=		export-variants
 +TESTS+=		gnode-submake
 +TESTS+=		hanoi-include
 +TESTS+=		impsrc
 +TESTS+=		include-main
 +TESTS+=		job-flags
 +TESTS+=		job-output-long-lines
 +TESTS+=		job-output-null
 +TESTS+=		jobs-empty-commands
 +TESTS+=		jobs-empty-commands-error
 +TESTS+=		jobs-error-indirect
 +TESTS+=		jobs-error-nested
 +TESTS+=		jobs-error-nested-make
 +TESTS+=		lint
 +TESTS+=		make-exported
 +TESTS+=		meta-cmd-cmp
 +TESTS+=		moderrs
 +TESTS+=		modmisc
 +.if ${.MAKE.UID} > 0
 +TESTS+=		objdir-writable
 +.endif
 +TESTS+=		opt
 +TESTS+=		opt-backwards
 +TESTS+=		opt-chdir
 +TESTS+=		opt-debug
 +TESTS+=		opt-debug-all
 +TESTS+=		opt-debug-archive
 +TESTS+=		opt-debug-curdir
 +TESTS+=		opt-debug-cond
 +TESTS+=		opt-debug-dir
 +TESTS+=		opt-debug-errors
 +TESTS+=		opt-debug-errors-jobs
 +TESTS+=		opt-debug-file
 +TESTS+=		opt-debug-for
 +TESTS+=		opt-debug-graph1
 +TESTS+=		opt-debug-graph2
 +TESTS+=		opt-debug-graph3
 +TESTS+=		opt-debug-hash
 +TESTS+=		opt-debug-jobs
 +TESTS+=		opt-debug-lint
 +TESTS+=		opt-debug-loud
 +TESTS+=		opt-debug-meta
 +TESTS+=		opt-debug-making
 +TESTS+=		opt-debug-no-rm
 +TESTS+=		opt-debug-parse
 +TESTS+=		opt-debug-suff
 +TESTS+=		opt-debug-targets
 +TESTS+=		opt-debug-varraw
 +TESTS+=		opt-debug-var
 +TESTS+=		opt-debug-x-trace
 +TESTS+=		opt-define
 +TESTS+=		opt-env
 +TESTS+=		opt-file
 +TESTS+=		opt-ignore
 +TESTS+=		opt-include-dir
 +TESTS+=		opt-jobs
 +TESTS+=		opt-jobs-internal
 +TESTS+=		opt-jobs-no-action
 +TESTS+=		opt-keep-going
 +TESTS+=		opt-keep-going-indirect
 +TESTS+=		opt-keep-going-multiple
 +TESTS+=		opt-m-include-dir
 +TESTS+=		opt-no-action
 +TESTS+=		opt-no-action-at-all
 +TESTS+=		opt-no-action-runflags
 +TESTS+=		opt-no-action-touch
 +TESTS+=		opt-query
 +TESTS+=		opt-raw
 +TESTS+=		opt-silent
 +TESTS+=		opt-touch
 +TESTS+=		opt-touch-jobs
 +TESTS+=		opt-tracefile
 +TESTS+=		opt-var-expanded
 +TESTS+=		opt-var-literal
 +TESTS+=		opt-version
 +TESTS+=		opt-warnings-as-errors
 +TESTS+=		opt-where-am-i
 +TESTS+=		opt-x-reduce-exported
 +TESTS+=		order
 +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
 +TESTS+=		sh-dots
 +TESTS+=		sh-errctl
 +TESTS+=		sh-flags
 +TESTS+=		sh-jobs
 +TESTS+=		sh-jobs-error
 +TESTS+=		sh-leading-at
 +TESTS+=		sh-leading-hyphen
 +TESTS+=		sh-leading-plus
 +TESTS+=		sh-meta-chars
 +TESTS+=		sh-multi-line
 +TESTS+=		sh-single-line
 +TESTS+=		shell-csh
 +TESTS+=		shell-custom
 +.if exists(/bin/ksh)
 +TESTS+=		shell-ksh
 +.endif
 +TESTS+=		shell-sh
 +TESTS+=		suff
 +TESTS+=		suff-add-later
 +TESTS+=		suff-clear-regular
 +TESTS+=		suff-clear-single
 +TESTS+=		suff-incomplete
 +TESTS+=		suff-lookup
 +TESTS+=		suff-main
 +TESTS+=		suff-main-several
 +TESTS+=		suff-phony
 +TESTS+=		suff-rebuild
 +TESTS+=		suff-self
 +TESTS+=		suff-transform-debug
 +TESTS+=		suff-transform-endless
 +TESTS+=		suff-transform-expand
 +TESTS+=		suff-transform-select
 +TESTS+=		suff-use
 +TESTS+=		sunshcmd
 +TESTS+=		ternary
 +TESTS+=		unexport
 +TESTS+=		unexport-env
 +TESTS+=		use-inference
 +TESTS+=		var-readonly
 +TESTS+=		var-scope
 +TESTS+=		var-scope-cmdline
 +TESTS+=		var-scope-env
 +TESTS+=		var-scope-global
 +TESTS+=		var-scope-local
 +TESTS+=		var-scope-local-legacy
 +TESTS+=		var-eval-short
 +TESTS+=		var-op
 +TESTS+=		var-op-append
 +TESTS+=		var-op-assign
 +TESTS+=		var-op-default
 +TESTS+=		var-op-expand
 +TESTS+=		var-op-shell
 +TESTS+=		var-op-sunsh
 +TESTS+=		var-recursive
 +TESTS+=		varcmd
 +TESTS+=		vardebug
 +TESTS+=		varfind
 +TESTS+=		varmisc
 +TESTS+=		varmod
 +TESTS+=		varmod-assign
 +TESTS+=		varmod-assign-shell
 +TESTS+=		varmod-defined
 +TESTS+=		varmod-edge
 +TESTS+=		varmod-exclam-shell
 +TESTS+=		varmod-extension
 +TESTS+=		varmod-gmtime
 +TESTS+=		varmod-hash
 +TESTS+=		varmod-head
 +TESTS+=		varmod-ifelse
 +TESTS+=		varmod-indirect
 +TESTS+=		varmod-l-name-to-value
 +TESTS+=		varmod-localtime
 +TESTS+=		varmod-loop
 +TESTS+=		varmod-loop-delete
 +TESTS+=		varmod-loop-varname
 +TESTS+=		varmod-match
 +TESTS+=		varmod-match-escape
 +TESTS+=		varmod-mtime
 +TESTS+=		varmod-no-match
 +TESTS+=		varmod-order
 +TESTS+=		varmod-order-numeric
 +TESTS+=		varmod-order-reverse
 +TESTS+=		varmod-order-shuffle
 +TESTS+=		varmod-order-string
 +TESTS+=		varmod-path
 +TESTS+=		varmod-quote
 +TESTS+=		varmod-quote-dollar
 +TESTS+=		varmod-range
 +TESTS+=		varmod-remember
 +TESTS+=		varmod-root
 +TESTS+=		varmod-select-words
 +TESTS+=		varmod-shell
 +TESTS+=		varmod-subst
 +TESTS+=		varmod-subst-regex
 +TESTS+=		varmod-sun-shell
 +TESTS+=		varmod-sysv
 +TESTS+=		varmod-tail
 +TESTS+=		varmod-to-abs
 +TESTS+=		varmod-to-lower
 +TESTS+=		varmod-to-many-words
 +TESTS+=		varmod-to-one-word
 +TESTS+=		varmod-to-separator
 +TESTS+=		varmod-to-title
 +TESTS+=		varmod-to-upper
 +TESTS+=		varmod-undefined
 +TESTS+=		varmod-unique
 +TESTS+=		varname
 +TESTS+=		varname-dollar
 +TESTS+=		varname-dot-alltargets
 +TESTS+=		varname-dot-curdir
 +TESTS+=		varname-dot-includes
 +TESTS+=		varname-dot-includedfromdir
 +TESTS+=		varname-dot-includedfromfile
 +TESTS+=		varname-dot-libs
 +TESTS+=		varname-dot-make-dependfile
 +TESTS+=		varname-dot-make-expand_variables
 +TESTS+=		varname-dot-make-exported
 +TESTS+=		varname-dot-make-jobs
 +TESTS+=		varname-dot-make-jobs-prefix
 +TESTS+=		varname-dot-make-level
 +TESTS+=		varname-dot-make-makefile_preference
 +TESTS+=		varname-dot-make-makefiles
 +TESTS+=		varname-dot-make-meta-bailiwick
 +TESTS+=		varname-dot-make-meta-created
 +TESTS+=		varname-dot-make-meta-files
 +.if ${.MAKE.PATH_FILEMON:Uno:Nktrace:N/dev*} == "" && ${TMPDIR:N/tmp*:N/var/tmp*} != ""
 +# these tests will not work if TMPDIR is or is a subdir of
 +# /tmp or /var/tmp
 +.if ${.MAKE.PATH_FILEMON:N/dev/*} != "" || exists(${.MAKE.PATH_FILEMON})
 +TESTS+=		varname-dot-make-meta-ignore_filter
 +TESTS+=		varname-dot-make-meta-ignore_paths
 +TESTS+=		varname-dot-make-meta-ignore_patterns
 +TESTS+=		varname-dot-make-path_filemon
 +.else
 +.warning Skipping tests that require ${.MAKE.PATH_FILEMON}
 +.endif
 +.endif
 +TESTS+=		varname-dot-make-meta-prefix
 +TESTS+=		varname-dot-make-mode
 +TESTS+=		varname-dot-make-pid
 +TESTS+=		varname-dot-make-ppid
 +TESTS+=		varname-dot-make-save_dollars
 +TESTS+=		varname-dot-makeflags
 +TESTS+=		varname-dot-makeoverrides
 +TESTS+=		varname-dot-newline
 +TESTS+=		varname-dot-objdir
 +TESTS+=		varname-dot-parsedir
 +TESTS+=		varname-dot-parsefile
 +TESTS+=		varname-dot-path
 +TESTS+=		varname-dot-shell
 +TESTS+=		varname-dot-suffixes
 +TESTS+=		varname-dot-targets
 +TESTS+=		varname-empty
 +TESTS+=		varname-make
 +TESTS+=		varname-make_print_var_on_error
 +TESTS+=		varname-make_print_var_on_error-jobs
 +TESTS+=		varname-makefile
 +TESTS+=		varname-makeflags
 +TESTS+=		varname-pwd
 +TESTS+=		varname-vpath
 +TESTS+=		varparse-dynamic
 +TESTS+=		varparse-errors
 +TESTS+=		varparse-mod
 +TESTS+=		varparse-undef-partial
 +
 +# some shells have quirks
 +_shell:= ${.SHELL:tA:T}
 +.if ${_shell} == "dash" 
 +# dash fails -x output
 +BROKEN_TESTS+= opt-debug-x-trace
 +.elif ${_shell:N*ksh*} == ""
 +BROKEN_TESTS+= \
 +	deptgt-silent-jobs \
 +	job-flags \
 +	job-output-long-lines \
 +	opt-debug-x-trace \
 +	sh-flags \
 +	var-op-shell \
 +
 +.if ${_shell:Nmksh} == ""
 +# more broken that pdksh
 +BROKEN_TESTS+= \
 +	opt-jobs-no-action \
 +	sh-errctl \
 +	sh-leading-hyphen \
 +
 +.endif
 +.endif
 +
 +.if ${UTC_1:Uno} == ""
 +# this will not work if UTC_1 is set empty
 +BROKEN_TESTS+= varmod-localtime
 +.endif
 +
 +.if ${.MAKE.OS:NDarwin} == ""
 +BROKEN_TESTS+= shell-ksh
 +.endif
 +
 +.if ${.MAKE.OS:NIRIX*} == ""
 +BROKEN_TESTS+= \
 +	cmd-interrupt \
 +	deptgt-interrupt \
 +	job-output-null \
 +	opt-chdir \
 +	opt-debug-x-trace \
 +	sh-leading-hyphen \
 +
 +.endif
 +
 +.if ${.MAKE.OS} == "SCO_SV"
 +BROKEN_TESTS+= \
 +	opt-debug-graph[23] \
 +	varmod-localtime \
 +	varmod-to-separator \
 +
 +.if ${_shell} == "bash"
 +BROKEN_TESTS+= job-output-null
 +.else
 +BROKEN_TESTS+= \
 +	cmd-interrupt \
 +	job-flags \
 +
 +.endif
 +.endif
 +
 +# Some tests just do not work on some platforms or environments
 +# so allow for some filtering.
 +.if !empty(BROKEN_TESTS)
 +.warning Skipping broken tests: ${BROKEN_TESTS:O:u}
 +TESTS:= ${TESTS:${BROKEN_TESTS:S,^,N,:ts:}}
 +.endif
 +
 +# Ideas for more tests:
 +#	char-0020-space.mk
 +#	char-005C-backslash.mk
 +#	escape-cond-str.mk
 +#	escape-cond-func-arg.mk
 +#	escape-varmod.mk
 +#	escape-varmod-define.mk
 +#	escape-varmod-match.mk
 +#	escape-varname.mk
 +#	escape-varassign-varname.mk
 +#	escape-varassign-varname-cmdline.mk
 +#	escape-varassign-value.mk
 +#	escape-varassign-value-cmdline.mk
 +#	escape-dependency-source.mk
 +#	escape-dependency-target.mk
 +#	escape-for-varname.mk
 +#	escape-for-item.mk
 +#	posix-*.mk (see posix.mk and posix1.mk)
 +
 +# Additional environment variables for some of the tests.
 +# The base environment is -i PATH="$PATH".
 +ENV.depsrc-optional+=   TZ=UTC
 +ENV.deptgt-phony+=	MAKESYSPATH=.
 +ENV.directive-undef=	ENV_VAR=env-value
 +ENV.opt-env=		FROM_ENV=value-from-env
 +ENV.opt-m-include-dir=	${MAKEOBJDIR:DMAKEOBJDIR=${MAKEOBJDIR}}
 +ENV.varmisc=		FROM_ENV=env
 +ENV.varmisc+=		FROM_ENV_BEFORE=env
 +ENV.varmisc+=		FROM_ENV_AFTER=env
 +ENV.varmod-localtime+=	TZ=${UTC_1:UEurope/Berlin}
 +ENV.varname-vpath+=	VPATH=varname-vpath.dir:varname-vpath.dir2
 +
 +# Override make flags for some of the tests; default is -k.
 +# If possible, write ".MAKEFLAGS: -dv" in the test .mk file instead of
 +# settings FLAGS.test=-dv here, since that is closer to the test code.
 +FLAGS.cond-func-make=		via-cmdline
 +FLAGS.doterror=			# none, especially not -k
 +FLAGS.jobs-error-indirect=	# none, especially not -k
 +FLAGS.jobs-error-nested=	# none, especially not -k
 +FLAGS.jobs-error-nested-make=	# none, especially not -k
 +FLAGS.varname-empty=		-dv '$${:U}=cmdline-u' '=cmdline-plain'
 +
 +# Some tests need extra postprocessing.
 +SED_CMDS.deptgt-phony=	${STD_SED_CMDS.dd}
 +SED_CMDS.dir=		${STD_SED_CMDS.dd}
 +SED_CMDS.directive-include-guard= \
 +	-e '/\.MAKEFLAGS/d' \
 +	-e '/^Parsing .*:[1-9][0-9]*:/d' \
 +	-e '/^SetFilenameVars:/d' \
 +	-e '/^ParseDependency/d' \
 +	-e '/^ParseEOF:/d'
 +SED_CMDS.export=	-e '/^[^=_A-Za-z0-9]*=/d'
 +.if ${.MAKE.OS:NCygwin} == ""
 +SED_CMDS.export+=	-e '/^WINDIR=/d' -e '/^SYSTEMROOT=/d'
 +.endif
 +SED_CMDS.export-all=	${SED_CMDS.export}
 +SED_CMDS.export-env=	${SED_CMDS.export}
 +SED_CMDS.cmdline=	-e 's,uid${.MAKE.UID}/,,'
 +SED_CMDS.job-output-long-lines= \
 +	${:D Job separators on their own line are ok. } \
 +	-e '/^--- job-[ab] ---$$/d' \
 +	${:D Plain output lines are ok as well. } \
 +	${:D They may come in multiples of 1024 or as 10000. } \
 +	-e '/^aa*$$/d' \
 +	-e '/^bb*$$/d' \
 +	${:D The following lines should rather not occur since the job } \
 +	${:D marker should always be at the beginning of the line. } \
 +	-e '/^aa*--- job-b ---$$/d' \
 +	-e '/^bb*--- job-a ---$$/d'
 +SED_CMDS.opt-chdir=		-e 's,\(nonexistent\).[1-9][0-9]*,\1,' \
 +	-e '/name/s,file,File,' \
 +	-e 's,no such,No such,' \
 +	-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}
 +SED_CMDS.opt-debug-hash=	-e 's,\(entries\)=[1-9][0-9],\1=<entries>,'
 +SED_CMDS.opt-debug-jobs=	-e 's,([0-9][0-9]*),(<pid>),'
 +SED_CMDS.opt-debug-jobs+=	-e 's,pid [0-9][0-9]*,pid <pid>,'
 +SED_CMDS.opt-debug-jobs+=	-e 's,Process [0-9][0-9]*,Process <pid>,'
 +SED_CMDS.opt-debug-jobs+=	-e 's,JobFinish: [0-9][0-9]*,JobFinish: <pid>,'
 +SED_CMDS.opt-debug-jobs+=	-e 's,Command: ${.SHELL:T},Command: <shell>,'
 +# The "-q" may be there or not, see jobs.c, variable shells.
 +SED_CMDS.opt-debug-jobs+=	-e 's,^\(.Command: <shell>\) -q,\1,'
 +SED_CMDS.opt-debug-lint+=	${STD_SED_CMDS.regex}
 +SED_CMDS.opt-jobs-no-action=	${STD_SED_CMDS.hide-from-output}
 +SED_CMDS.opt-no-action-runflags= ${STD_SED_CMDS.hide-from-output}
 +SED_CMDS.opt-where-am-i=	-e '/usr.obj/d'
 +# For Compat_RunCommand, useShell == false.
 +SED_CMDS.sh-dots=		-e 's,^.*\.\.\.:.*,<not found: ...>,'
 +# For Compat_RunCommand, useShell == true.
 +SED_CMDS.sh-dots+=		-e 's,^make: exec(\(.*\)) failed (.*)$$,<not found: \1>,'
 +SED_CMDS.sh-dots+=		-e 's,^\(\*\*\* Error code \)[1-9][0-9]*,\1<nonzero>,'
 +SED_CMDS.sh-errctl=		${STD_SED_CMDS.dj}
 +SED_CMDS.sh-flags=		${STD_SED_CMDS.hide-from-output}
 +SED_CMDS.shell-csh=		${STD_SED_CMDS.white-space}
 +SED_CMDS.sh-leading-hyphen=	${STD_SED_CMDS.shell}
 +SED_CMDS.suff-main+=		${STD_SED_CMDS.dg1}
 +SED_CMDS.suff-main-several+=	${STD_SED_CMDS.dg1}
 +SED_CMDS.suff-transform-debug+=	${STD_SED_CMDS.dg1}
 +SED_CMDS.var-op-shell+=		${STD_SED_CMDS.shell}
 +SED_CMDS.var-op-shell+=		-e '/command/s,No such.*,not found,'
 +SED_CMDS.var-op-shell+=		${STD_SED_CMDS.white-space}
 +SED_CMDS.vardebug+=		-e 's,${.SHELL},</path/to/shell>,'
 +SED_CMDS.varmod-mtime+=		-e "s,\(.*\)': .*,\1': <ENOENT>,"
 +SED_CMDS.varmod-subst-regex+=	${STD_SED_CMDS.regex}
 +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'
 +SED_CMDS.varname-empty=		${.OBJDIR .PARSEDIR .PATH .SHELL .SYSPATH:L:@v@-e '/\\$v/d'@}
 +
 +# Some tests need an additional round of postprocessing.
 +POSTPROC.depsrc-wait=		sed -e '/^---/d' -e 's,^\(: Making 3[abc]\)[123]$$,\1,'
 +POSTPROC.deptgt-suffixes=	awk '/^\#\*\*\* Suffixes/,/^never-stop/'
 +POSTPROC.gnode-submake=		awk '/Input graph/, /^$$/'
 +POSTPROC.varname-dot-make-mode=	sed 's,^\(: Making [abc]\)[123]$$,\1,'
 +
 +# Some tests reuse other tests, which makes them unnecessarily fragile.
 +export-all.rawout: export.mk
 +unexport.rawout: export.mk
 +unexport-env.rawout: export.mk
 +
 +# End of the configuration section.
 +
 +# Some standard sed commands, to be used in the SED_CMDS above.
 +
 +# In tests that use the debugging option -dd, ignore debugging output that is
 +# only logged in -DCLEANUP mode.
 +STD_SED_CMDS.dd=	-e '/^OpenDirs_Done:/d'
 +STD_SED_CMDS.dd+=	-e '/^CachedDir /d'
 +STD_SED_CMDS.dd+=	-e 's,  ${DEFSYSPATH:U/usr/share/mk} ,  <defsyspath> ,'
 +
 +# Omit details such as process IDs from the output of the -dg1 option.
 +STD_SED_CMDS.dg1=	-e '/\#.* \.$$/d'
 +STD_SED_CMDS.dg1+=	-e '/\.MAKE.PATH_FILEMON/d'
 +STD_SED_CMDS.dg1+=	-e '/^\#.*\/mk/d'
 +STD_SED_CMDS.dg1+=	-e 's,  ${DEFSYSPATH:U/usr/share/mk}$$,  <defsyspath>,'
 +STD_SED_CMDS.dg1+=	-e 's,^\(\.MAKE *=\) .*,\1 <details omitted>,'
 +STD_SED_CMDS.dg1+=	-e 's,^\(\.MAKE\.[A-Z_]* *=\) .*,\1 <details omitted>,'
 +STD_SED_CMDS.dg1+=	-e 's,^\(\.MAKE\.JOBS\.C *=\) .*,\1 <details omitted>,'
 +STD_SED_CMDS.dg1+=	-e 's,^\(MACHINE[_ARCH]* *=\) .*,\1 <details omitted>,'
 +STD_SED_CMDS.dg1+=	-e 's,^\(MAKE *=\) .*,\1 <details omitted>,'
 +STD_SED_CMDS.dg1+=	-e 's,^\(\.SHELL *=\) .*,\1 <details omitted>,'
*** 227 LINES SKIPPED ***