[src/trunk]: src/usr.bin/make/unit-tests make(1): move some of the SysV modif...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/aac8a0174e17
branches:  trunk
changeset: 937679:aac8a0174e17
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Aug 23 14:52:06 2020 +0000

description:
make(1): move some of the SysV modifier tests into another file

diffstat:

 usr.bin/make/unit-tests/sysv.exp        |   7 ---
 usr.bin/make/unit-tests/sysv.mk         |  58 +-------------------------------
 usr.bin/make/unit-tests/varmod-sysv.exp |   7 +++
 usr.bin/make/unit-tests/varmod-sysv.mk  |  58 ++++++++++++++++++++++++++++++--
 4 files changed, 63 insertions(+), 67 deletions(-)

diffs (166 lines):

diff -r e3f61de51eda -r aac8a0174e17 usr.bin/make/unit-tests/sysv.exp
--- a/usr.bin/make/unit-tests/sysv.exp  Sun Aug 23 14:46:33 2020 +0000
+++ b/usr.bin/make/unit-tests/sysv.exp  Sun Aug 23 14:52:06 2020 +0000
@@ -12,11 +12,4 @@
 asam.c
 a.c.c
 
-ax:Q b c d eb
-bcd.e
-&
-anchor-dollar: value
-anchor-dollar: valux
-mismatch: file.cpp file.h
-mismatch: renamed.c other.c
 exit status 0
diff -r e3f61de51eda -r aac8a0174e17 usr.bin/make/unit-tests/sysv.mk
--- a/usr.bin/make/unit-tests/sysv.mk   Sun Aug 23 14:46:33 2020 +0000
+++ b/usr.bin/make/unit-tests/sysv.mk   Sun Aug 23 14:52:06 2020 +0000
@@ -1,7 +1,6 @@
-# $Id: sysv.mk,v 1.12 2020/08/01 13:35:13 rillig Exp $
+# $Id: sysv.mk,v 1.13 2020/08/23 14:52:06 rillig Exp $
 
-all: foo fun sam bla words ampersand anchor-dollar
-all: mismatch
+all: foo fun sam bla
 
 FOO ?=
 FOOBAR = ${FOO:=bar}
@@ -42,56 +41,3 @@
 
 bla:
        @echo $(BLA:%=foo/%x)
-
-# The :Q looks like a modifier but isn't.
-# It is part of the replacement string.
-words:
-       @echo a${a b c d e:L:%a=x:Q}b
-
-# Before 2020-07-19, an ampersand could be used in the replacement part
-# of a SysV substitution modifier.  This was probably a copy-and-paste
-# mistake since the SysV modifier code looked a lot like the code for the
-# :S and :C modifiers.  The ampersand is not mentioned in the manual page.
-ampersand:
-       @echo ${:U${a.bcd.e:L:a.%=%}:Q}
-       @echo ${:U${a.bcd.e:L:a.%=&}:Q}
-
-# Before 2020-07-20, when a SysV modifier was parsed, a single dollar
-# before the '=' was interpreted as an anchor, which doesn't make sense
-# since the anchor was discarded immediately.
-anchor-dollar:
-       @echo $@: ${:U${value:L:e$=x}:Q}
-       @echo $@: ${:U${value:L:e=x}:Q}
-
-# Words that don't match are copied unmodified.
-# The % placeholder can be anywhere in the string.
-mismatch:
-       @echo $@: ${:Ufile.c file.h:%.c=%.cpp}
-       @echo $@: ${:Ufile.c other.c:file.%=renamed.%}
-
-# Trying to cover all possible variants of the SysV modifier.
-LIST=  one two
-EXPR.1=        ${LIST:o=X}
-EXP.1= one twX
-EXPR.2=        ${LIST:o=}
-EXP.2= one tw
-EXPR.3=        ${LIST:o=%}
-EXP.3= one tw%
-EXPR.4=        ${LIST:%o=X}
-EXP.4= one X
-EXPR.5=        ${LIST:o%=X}
-EXP.5= X two
-EXPR.6=        ${LIST:o%e=X}
-EXP.6= X two
-EXPR.7=        ${LIST:o%%e=X}          # Only the first '%' is the wildcard.
-EXP.7= one two                 # None of the words contains a literal '%'.
-EXPR.8=        ${LIST:%=%%}
-EXP.8= one% two%
-EXPR.9=        ${LIST:%nes=%xxx}       # lhs is longer than the word "one"
-EXP.9= one two
-
-.for i in ${:U:range=9}
-.if ${EXPR.$i} != ${EXP.$i}
-.warning test case $i expected "${EXP.$i}", got "${EXPR.$i}
-.endif
-.endfor
diff -r e3f61de51eda -r aac8a0174e17 usr.bin/make/unit-tests/varmod-sysv.exp
--- a/usr.bin/make/unit-tests/varmod-sysv.exp   Sun Aug 23 14:46:33 2020 +0000
+++ b/usr.bin/make/unit-tests/varmod-sysv.exp   Sun Aug 23 14:52:06 2020 +0000
@@ -1,1 +1,8 @@
+ax:Q b c d eb
+bcd.e
+&
+anchor-dollar: value
+anchor-dollar: valux
+mismatch: file.cpp file.h
+mismatch: renamed.c other.c
 exit status 0
diff -r e3f61de51eda -r aac8a0174e17 usr.bin/make/unit-tests/varmod-sysv.mk
--- a/usr.bin/make/unit-tests/varmod-sysv.mk    Sun Aug 23 14:46:33 2020 +0000
+++ b/usr.bin/make/unit-tests/varmod-sysv.mk    Sun Aug 23 14:52:06 2020 +0000
@@ -1,11 +1,61 @@
-# $NetBSD: varmod-sysv.mk,v 1.2 2020/08/16 14:25:16 rillig Exp $
+# $NetBSD: varmod-sysv.mk,v 1.3 2020/08/23 14:52:06 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.
 
-# TODO: Implementation
+all: words ampersand anchor-dollar mismatch
+
+# The :Q looks like a modifier but isn't.
+# It is part of the replacement string.
+words:
+       @echo a${a b c d e:L:%a=x:Q}b
+
+# Before 2020-07-19, an ampersand could be used in the replacement part
+# of a SysV substitution modifier.  This was probably a copy-and-paste
+# mistake since the SysV modifier code looked a lot like the code for the
+# :S and :C modifiers.  The ampersand is not mentioned in the manual page.
+ampersand:
+       @echo ${:U${a.bcd.e:L:a.%=%}:Q}
+       @echo ${:U${a.bcd.e:L:a.%=&}:Q}
+
+# Before 2020-07-20, when a SysV modifier was parsed, a single dollar
+# before the '=' was interpreted as an anchor, which doesn't make sense
+# since the anchor was discarded immediately.
+anchor-dollar:
+       @echo $@: ${:U${value:L:e$=x}:Q}
+       @echo $@: ${:U${value:L:e=x}:Q}
 
-all:
-       @:;
+# Words that don't match are copied unmodified.
+# The % placeholder can be anywhere in the string.
+mismatch:
+       @echo $@: ${:Ufile.c file.h:%.c=%.cpp}
+       @echo $@: ${:Ufile.c other.c:file.%=renamed.%}
+
+# Trying to cover all possible variants of the SysV modifier.
+LIST=  one two
+EXPR.1=        ${LIST:o=X}
+EXP.1= one twX
+EXPR.2=        ${LIST:o=}
+EXP.2= one tw
+EXPR.3=        ${LIST:o=%}
+EXP.3= one tw%
+EXPR.4=        ${LIST:%o=X}
+EXP.4= one X
+EXPR.5=        ${LIST:o%=X}
+EXP.5= X two
+EXPR.6=        ${LIST:o%e=X}
+EXP.6= X two
+EXPR.7=        ${LIST:o%%e=X}          # Only the first '%' is the wildcard.
+EXP.7= one two                 # None of the words contains a literal '%'.
+EXPR.8=        ${LIST:%=%%}
+EXP.8= one% two%
+EXPR.9=        ${LIST:%nes=%xxx}       # lhs is longer than the word "one"
+EXP.9= one two
+
+.for i in ${:U:range=9}
+.if ${EXPR.$i} != ${EXP.$i}
+.warning test case $i expected "${EXP.$i}", got "${EXPR.$i}
+.endif
+.endfor