[src/trunk]: src/usr.bin/make/unit-tests make(1): renumber the tests in moder...

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

details:   https://anonhg.NetBSD.org/src/rev/a7247f4a68c1
branches:  trunk
changeset: 956532:a7247f4a68c1
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Nov 01 10:53:58 2020 +0000

description:
make(1): renumber the tests in moderrs.mk, remove duplicates

diffstat:

 usr.bin/make/unit-tests/moderrs.exp |  42 +++++++-----------------------------
 usr.bin/make/unit-tests/moderrs.mk  |  32 +++++++--------------------
 2 files changed, 17 insertions(+), 57 deletions(-)

diffs (125 lines):

diff -r 309372a803f5 -r a7247f4a68c1 usr.bin/make/unit-tests/moderrs.exp
--- a/usr.bin/make/unit-tests/moderrs.exp       Sun Nov 01 10:52:09 2020 +0000
+++ b/usr.bin/make/unit-tests/moderrs.exp       Sun Nov 01 10:53:58 2020 +0000
@@ -57,59 +57,33 @@
 
 mod-subst-delimiter:
 make: Missing delimiter for :S modifier
-
-make: Unfinished modifier for VAR (',' missing)
-
-make: Unfinished modifier for VAR (',' missing)
-
-make: Unfinished modifier for VAR (',' missing)
-
-make: Unfinished modifier for VAR (',' missing)
-
-make: Unclosed variable specification (expecting '}') for "VAR" (value "TheVariable") modifier S
-TheVariable
-TheVariable
-make: Missing delimiter for :S modifier
 1:
 make: Unfinished modifier for VAR (',' missing)
 2:
 make: Unfinished modifier for VAR (',' missing)
 3:
 make: Unfinished modifier for VAR (',' missing)
-
+4:
 make: Unfinished modifier for VAR (',' missing)
-
+5:
 make: Unclosed variable specification (expecting '}') for "VAR" (value "TheVariable") modifier S
-TheVariable
-TheVariable
+6: TheVariable
+7: TheVariable
 
 mod-regex-delimiter:
 make: Missing delimiter for :C modifier
-
-make: Unfinished modifier for VAR (',' missing)
-
-make: Unfinished modifier for VAR (',' missing)
-
-make: Unfinished modifier for VAR (',' missing)
-
-make: Unfinished modifier for VAR (',' missing)
-
-make: Unclosed variable specification (expecting '}') for "VAR" (value "TheVariable") modifier C
-TheVariable
-TheVariable
-make: Missing delimiter for :C modifier
 1:
 make: Unfinished modifier for VAR (',' missing)
 2:
 make: Unfinished modifier for VAR (',' missing)
 3:
 make: Unfinished modifier for VAR (',' missing)
-
+4:
 make: Unfinished modifier for VAR (',' missing)
-
+5:
 make: Unclosed variable specification (expecting '}') for "VAR" (value "TheVariable") modifier C
-TheVariable
-TheVariable
+6: TheVariable
+7: TheVariable
 
 mod-regex-undefined-subexpression:
 one one 2 3 5 8 one3 2one 34
diff -r 309372a803f5 -r a7247f4a68c1 usr.bin/make/unit-tests/moderrs.mk
--- a/usr.bin/make/unit-tests/moderrs.mk        Sun Nov 01 10:52:09 2020 +0000
+++ b/usr.bin/make/unit-tests/moderrs.mk        Sun Nov 01 10:53:58 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: moderrs.mk,v 1.21 2020/11/01 10:52:09 rillig Exp $
+# $NetBSD: moderrs.mk,v 1.22 2020/11/01 10:53:58 rillig Exp $
 #
 # various modifier error tests
 
@@ -96,36 +96,22 @@
        @echo ${!:L:!=exclam}
 
 mod-subst-delimiter: print-header print-footer
-       @echo ${VAR:S
-       @echo ${VAR:S,
-       @echo ${VAR:S,from
-       @echo ${VAR:S,from,
-       @echo ${VAR:S,from,to
-       @echo ${VAR:S,from,to,
-       @echo ${VAR:S,from,to,}
        @echo 1: ${VAR:S
        @echo 2: ${VAR:S,
        @echo 3: ${VAR:S,from
-       @echo ${VAR:S,from,
-       @echo ${VAR:S,from,to
-       @echo ${VAR:S,from,to,
-       @echo ${VAR:S,from,to,}
+       @echo 4: ${VAR:S,from,
+       @echo 5: ${VAR:S,from,to
+       @echo 6: ${VAR:S,from,to,
+       @echo 7: ${VAR:S,from,to,}
 
 mod-regex-delimiter: print-header print-footer
-       @echo ${VAR:C
-       @echo ${VAR:C,
-       @echo ${VAR:C,from
-       @echo ${VAR:C,from,
-       @echo ${VAR:C,from,to
-       @echo ${VAR:C,from,to,
-       @echo ${VAR:C,from,to,}
        @echo 1: ${VAR:C
        @echo 2: ${VAR:C,
        @echo 3: ${VAR:C,from
-       @echo ${VAR:C,from,
-       @echo ${VAR:C,from,to
-       @echo ${VAR:C,from,to,
-       @echo ${VAR:C,from,to,}
+       @echo 4: ${VAR:C,from,
+       @echo 5: ${VAR:C,from,to
+       @echo 6: ${VAR:C,from,to,
+       @echo 7: ${VAR:C,from,to,}
 
 # In regular expressions with alternatives, not all capturing groups are
 # always set; some may be missing.  Warn about these.