Module Name: src
Committed By: rillig
Date: Sun Nov 1 10:52:09 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: moderrs.exp moderrs.mk
Log Message:
make(1): make test names in moderrs.mk more descriptive
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/make/unit-tests/moderrs.exp
cvs rdiff -u -r1.20 -r1.21 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.19 src/usr.bin/make/unit-tests/moderrs.exp:1.20
--- src/usr.bin/make/unit-tests/moderrs.exp:1.19 Sun Nov 1 10:50:22 2020
+++ src/usr.bin/make/unit-tests/moderrs.exp Sun Nov 1 10:52:09 2020
@@ -1,29 +1,29 @@
-modunkn:
+mod-unknown-direct:
want: Unknown modifier 'Z'
make: Unknown modifier 'Z'
VAR:Z=
-modunknV:
+mod-unknown-indirect:
want: Unknown modifier 'Z'
make: Unknown modifier 'Z'
VAR:Z=
-varterm:
+unclosed-direct:
want: Unclosed variable specification (expecting '}') for "VAR" (value "Thevariable") modifier S
make: Unclosed variable specification (expecting '}') for "VAR" (value "Thevariable") modifier S
VAR:S,V,v,=Thevariable
-vartermV:
+unclosed-indirect:
want: Unclosed variable specification after complex modifier (expecting '}') for VAR
make: Unclosed variable specification after complex modifier (expecting '}') for VAR
VAR:S,V,v,=Thevariable
-modtermV:
+unfinished-indirect:
want: Unfinished modifier for VAR (',' missing)
make: Unfinished modifier for VAR (',' missing)
VAR:S,V,v=
-modloop:
+unfinished-loop:
want: Unfinished modifier for UNDEF ('@' missing)
make: Unfinished modifier for UNDEF ('@' missing)
@@ -32,12 +32,12 @@ make: Unfinished modifier for UNDEF ('@'
1 2 3
-modloop-close:
+loop-close:
make: Unclosed variable specification (expecting '}') for "UNDEF" (value "1}... 2}... 3}...") modifier @
1}... 2}... 3}...
1}... 2}... 3}...
-modwords:
+words:
want: Unfinished modifier for UNDEF (']' missing)
make: Unfinished modifier for UNDEF (']' missing)
@@ -47,7 +47,7 @@ make: Unfinished modifier for UNDEF (']'
13=
12345=ok
-modexclam:
+exclam:
want: Unfinished modifier for VARNAME ('!' missing)
make: Unfinished modifier for VARNAME ('!' missing)
Index: src/usr.bin/make/unit-tests/moderrs.mk
diff -u src/usr.bin/make/unit-tests/moderrs.mk:1.20 src/usr.bin/make/unit-tests/moderrs.mk:1.21
--- src/usr.bin/make/unit-tests/moderrs.mk:1.20 Sun Nov 1 10:50:22 2020
+++ src/usr.bin/make/unit-tests/moderrs.mk Sun Nov 1 10:52:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: moderrs.mk,v 1.20 2020/11/01 10:50:22 rillig Exp $
+# $NetBSD: moderrs.mk,v 1.21 2020/11/01 10:52:09 rillig Exp $
#
# various modifier error tests
@@ -11,10 +11,12 @@ MOD_S:= ${MOD_TERM},
FIB= 1 1 2 3 5 8 13 21 34
-all: modunkn modunknV varterm vartermV modtermV modloop
-all: modloop-close
-all: modwords
-all: modexclam
+all: mod-unknown-direct mod-unknown-indirect
+all: unclosed-direct unclosed-indirect
+all: unfinished-indirect unfinished-loop
+all: loop-close
+all: words
+all: exclam
all: mod-subst-delimiter
all: mod-regex-delimiter
all: mod-regex-undefined-subexpression
@@ -24,27 +26,27 @@ all: mod-ifelse-parse
all: mod-remember-parse
all: mod-sysv-parse
-modunkn: print-header print-footer
+mod-unknown-direct: print-header print-footer
@echo 'want: Unknown modifier $'Z$''
@echo "VAR:Z=${VAR:Z}"
-modunknV: print-header print-footer
+mod-unknown-indirect: print-header print-footer
@echo 'want: Unknown modifier $'Z$''
@echo "VAR:${MOD_UNKN}=${VAR:${MOD_UNKN}}"
-varterm: print-header print-footer
+unclosed-direct: print-header print-footer
@echo 'want: Unclosed variable specification (expecting $'}$') for "VAR" (value "Thevariable") modifier S'
@echo VAR:S,V,v,=${VAR:S,V,v,
-vartermV: print-header print-footer
+unclosed-indirect: print-header print-footer
@echo 'want: Unclosed variable specification after complex modifier (expecting $'}$') for VAR'
@echo VAR:${MOD_TERM},=${VAR:${MOD_S}
-modtermV: print-header print-footer
+unfinished-indirect: print-header print-footer
@echo 'want: Unfinished modifier for VAR ($',$' missing)'
-@echo "VAR:${MOD_TERM}=${VAR:${MOD_TERM}}"
-modloop: print-header print-footer
+unfinished-loop: print-header print-footer
@echo 'want: Unfinished modifier for UNDEF ($'@$' missing)'
@echo ${UNDEF:U1 2 3:@var}
@echo 'want: Unfinished modifier for UNDEF ($'@$' missing)'
@@ -57,11 +59,11 @@ modloop: print-header print-footer
# braces must be balanced.
# This is also contrary to the SysV modifier, where only the actually
# used delimiter (either braces or parentheses) must be balanced.
-modloop-close: print-header print-footer
+loop-close: print-header print-footer
@echo ${UNDEF:U1 2 3:@var@${var}}...@
@echo ${UNDEF:U1 2 3:@var@${var}}...@}
-modwords: print-header print-footer
+words: print-header print-footer
@echo 'want: Unfinished modifier for UNDEF ($']$' missing)'
@echo ${UNDEF:U1 2 3:[}
@echo 'want: Unfinished modifier for UNDEF ($']$' missing)'
@@ -83,7 +85,7 @@ modwords: print-header print-footer
# which is empty.
@echo 12345=${UNDEF:U1 2 3:[123451234512345123451234512345]:S,^$,ok,:S,^3$,ok,}
-modexclam: print-header print-footer
+exclam: print-header print-footer
@echo 'want: Unfinished modifier for VARNAME ($'!$' missing)'
@echo ${VARNAME:!echo}
# When the final exclamation mark is missing, there is no
