Module Name: src
Committed By: rillig
Date: Sun Nov 1 10:53:58 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: moderrs.exp moderrs.mk
Log Message:
make(1): renumber the tests in moderrs.mk, remove duplicates
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/make/unit-tests/moderrs.exp
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/make/unit-tests/moderrs.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/moderrs.exp
diff -u src/usr.bin/make/unit-tests/moderrs.exp:1.20 src/usr.bin/make/unit-tests/moderrs.exp:1.21
--- src/usr.bin/make/unit-tests/moderrs.exp:1.20 Sun Nov 1 10:52:09 2020
+++ src/usr.bin/make/unit-tests/moderrs.exp Sun Nov 1 10:53:58 2020
@@ -57,59 +57,33 @@ make: Unfinished modifier for ! ('!' mis
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
Index: src/usr.bin/make/unit-tests/moderrs.mk
diff -u src/usr.bin/make/unit-tests/moderrs.mk:1.21 src/usr.bin/make/unit-tests/moderrs.mk:1.22
--- src/usr.bin/make/unit-tests/moderrs.mk:1.21 Sun Nov 1 10:52:09 2020
+++ src/usr.bin/make/unit-tests/moderrs.mk Sun Nov 1 10:53:58 2020
@@ -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 @@ exclam: print-header print-footer
@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.
