 @@ -1,14 +1,14 @@
-# $NetBSD: mi,v 1.952 2020/10/31 11:03:18 rillig Exp $
+# $NetBSD: mi,v 1.953 2020/10/31 11:06:24 rillig Exp $
+#
 # Note: don't delete entries from here - mark them as "obsolete" instead.
+#
 ./etc/mtree/set.tests					tests-sys-root
 ./usr/libdata/debug/usr/tests				tests-base-debug	compattestdir
 ./usr/libdata/debug/usr/tests/atf			tests-atf-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/atf/atf-c			tests-atf-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/atf/atf-c++		tests-atf-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/atf/atf-c++/detail	tests-atf-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/atf/atf-c/detail		tests-atf-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/atf/atf-compile		tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/atf/atf-report		tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/atf/atf-run		tests-obsolete		obsolete
 @@ -5254,28 +5254,28 @@
 ./usr/tests/usr.bin/make/unit-tests/suff-main.mk				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/suff-rebuild.exp				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/suff-rebuild.mk				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/suff-transform-endless.exp			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/suff-transform-endless.mk			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/suff-transform-expand.exp			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/suff-transform-expand.mk			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/suff-transform-select.exp			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/suff-transform-select.mk			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/suffixes.exp				tests-obsolete		obsolete
 ./usr/tests/usr.bin/make/unit-tests/suffixes.mk					tests-obsolete		obsolete
 ./usr/tests/usr.bin/make/unit-tests/sunshcmd.exp				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/sunshcmd.mk					tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/make/unit-tests/sysv.exp					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/sysv.exp					tests-obsolete		obsolete
-./usr/tests/usr.bin/make/unit-tests/sysv.mk					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/sysv.mk					tests-obsolete		obsolete
 ./usr/tests/usr.bin/make/unit-tests/ternary.exp					tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/ternary.mk					tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/unexport-env.exp				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/unexport-env.mk				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/unexport.exp				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/unexport.mk					tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/use-inference.exp				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/use-inference.mk				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/var-class-cmdline.exp			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/var-class-cmdline.mk			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/var-class-env.exp				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/var-class-env.mk				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/var-class-global.exp			tests-usr.bin-tests	compattestfile,atf

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.177 2020/10/30 15:03:58 rillig Exp $
+# $NetBSD: Makefile,v 1.178 2020/10/31 11:06:24 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
 @@ -251,27 +251,26 @@ TESTS+=		shell-csh
 TESTS+=		shell-custom
 TESTS+=		shell-ksh
 TESTS+=		shell-sh
 TESTS+=		suff-add-later
 TESTS+=		suff-clear-regular
 TESTS+=		suff-clear-single
 TESTS+=		suff-lookup
 TESTS+=		suff-main
 TESTS+=		suff-rebuild
 TESTS+=		suff-transform-endless
 TESTS+=		suff-transform-expand
 TESTS+=		suff-transform-select
 TESTS+=		sunshcmd
 TESTS+=		sysv
 TESTS+=		ternary
 TESTS+=		unexport
 TESTS+=		unexport-env
 TESTS+=		use-inference
 TESTS+=		var-class
 TESTS+=		var-class-cmdline
 TESTS+=		var-class-env
 TESTS+=		var-class-global
 TESTS+=		var-class-local
 TESTS+=		var-class-local-legacy
 TESTS+=		var-op
 TESTS+=		var-op-append
 TESTS+=		var-op-assign

 @@ -1,14 +1,14 @@
-# $NetBSD: varmod-sysv.mk,v 1.8 2020/10/31 10:18:32 rillig Exp $
+# $NetBSD: varmod-sysv.mk,v 1.9 2020/10/31 11:06:24 rillig Exp $
+#
 # Tests for the ${VAR:from=to} variable modifier, which replaces the suffix
 # "from" with "to".  It can also use '%' as a wildcard.
+#
 # This modifier is applied when the other modifiers don't match exactly.
+#
 # See ApplyModifier_SysV.
 # A typical use case for the :from=to modifier is conversion of filename
 # extensions.
 .if ${src.c:L:.c=.o} != "src.o"
 .  error
 .endif
 @@ -25,33 +25,72 @@
 # The :from=to modifier is therefore often combined with the :M modifier.
 .if ${src.c src.h:L:M*.c:.c=.o} != "src.o"
 .  error
 .endif
 # Another use case for the :from=to modifier is to append a suffix to each
 # word.  In this case, the "from" string is empty, therefore it always
 # matches.  The same effect can be achieved with the :S,$,teen, modifier.
 .if ${four six seven nine:L:=teen} != "fourteen sixteen seventeen nineteen"
 .  error
 .endif
 # The :from=to modifier can also be used to surround each word by strings.
 # It might be tempting to use this for enclosing a string in quotes for the
 # shell, but that's the job of the :Q modifier.
 .if ${one two three:L:%=(%)} != "(one) (two) (three)"
 .  error
 .endif
 # When the :from=to modifier is parsed, it lasts until the closing brace
 # or parenthesis.  The :Q in the below expression may look like a modifier
 # but isn't.  It is part of the replacement string.
 .if ${a b c d e:L:%a=x:Q} != "x:Q b c d e"
 .  error
 .endif
 # In the :from=to modifier, both parts can contain variable expressions.
 .if ${one two:L:${:Uone}=${:U1}} != "1 two"
 .  error
 .endif
 # In the :from=to modifier, the "from" part is expanded exactly once.
 .if ${:U\$ \$\$ \$\$\$\$:${:U\$\$\$\$}=4} != "\$ \$\$ 4"
 .  error
 .endif
 # In the :from=to modifier, the "to" part is expanded exactly twice.
 # XXX: The right-hand side should be expanded only once.
 # XXX: It's hard to get the escaping correct here, and to read that.
 # XXX: It's not intuitive why the closing brace must be escaped but not
 #      the opening brace.
 .if ${:U1 2 4:4=${:Uonce\${\:Utwice\}}} != "1 2 oncetwice"
 .  error
 .endif
 # The replacement string can contain spaces, thereby changing the number
 # of words in the variable expression.
 .if ${In:L:%=% ${:Uthe Sun}} != "In the Sun"
 .  error
 .endif
 # If the variable is empty, it is debatable whether it consists of a single
 # empty word, or no word at all.  The :from=to modifier treats it as no
 # word at all.
 .if ${:L:=suffix} != ""
 .  error
 .endif
 # Before 2020-07-19, an ampersand could be used in the replacement part
 # of a SysV substitution modifier, and it was replaced with the whole match,
 # just like in the :S modifier.
+#
 # This was probably a copy-and-paste mistake since the code for the SysV
 # modifier looked a lot like the code for the :S and :C modifiers.
 # The ampersand is not mentioned in the manual page.
 .if ${a.bcd.e:L:a.%=%} != "bcd.e"
 .  error
 .endif
 # Before 2020-07-19, the result of the expression was "a.bcd.e".
 .if ${a.bcd.e:L:a.%=&} != "&"
 .  error
 @@ -77,26 +116,32 @@
 .endif
 # Words that don't match are copied unmodified.
 .if ${:Ufile.c file.h:%.c=%.cpp} != "file.cpp file.h"
 .  error
 .endif
 # The % placeholder can be anywhere in the string, it doesn't have to be at
 # the beginning of the pattern.
 .if ${:Ufile.c other.c:file.%=renamed.%} != "renamed.c other.c"
 .  error
 .endif
 # It's also possible to modify each word by replacing the prefix and adding
 # a suffix.
 .if ${one two:L:o%=a%w} != "anew two"
 .  error
 .endif
 # Each word gets the suffix "X" appended.
 .if ${one two:L:=X} != "oneX twoX"
 .  error
 .endif
 # The suffix "o" is replaced with "X".
 .if ${one two:L:o=X} != "one twX"
 .  error
 .endif
 # The suffix "o" is replaced with nothing.
 .if ${one two:L:o=} != "one tw"
 .  error
 @@ -133,26 +178,34 @@
 # In the replacement, only the first '%' is the placeholder, all others
 # are literal percent characters.
 .if ${one two:L:%=%%} != "one% two%"
 .  error
 .endif
 # In the word "one", only a prefix of the pattern suffix "nes" matches,
 # the whole word is too short.  Therefore it doesn't match.
 .if ${one two:L:%nes=%xxx} != "one two"
 .  error
 .endif
 # The :from=to modifier can be used to replace both the prefix and a suffix
 # of a word with other strings.  This is not possible with a single :S
 # modifier, and using a :C modifier for the same task looks more complicated
 # in many cases.
 .if ${prefix-middle-suffix:L:prefix-%-suffix=p-%-s} != "p-middle-s"
 .  error
 .endif
 # As of 2020-10-06, the right-hand side of the SysV modifier is expanded
 # twice.  The first expansion happens in ApplyModifier_SysV, where the
 # modifier is split into its two parts.  The second expansion happens
 # when each word is replaced in ModifyWord_SYSVSubst.
 # XXX: This is unexpected.  Add more test case to demonstrate the effects
 # of removing one of the expansions.
 VALUE=		value
 INDIRECT=	1:${VALUE} 2:$${VALUE} 4:$$$${VALUE}
 .if ${x:L:x=${INDIRECT}} != "1:value 2:value 4:\${VALUE}"
 .  error
 .endif
 all: