Module Name: src
Committed By: rillig
Date: Tue Nov 3 18:18:31 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: varmod-subst.exp varmod-subst.mk
Log Message:
make(1): add all printable ASCII characters to the varmod-subst test
I must have missed some of them when I originally wrote the test. Not
sure how that happened. While here, use the official Unicode names.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/varmod-subst.exp
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/varmod-subst.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/varmod-subst.exp
diff -u src/usr.bin/make/unit-tests/varmod-subst.exp:1.2 src/usr.bin/make/unit-tests/varmod-subst.exp:1.3
--- src/usr.bin/make/unit-tests/varmod-subst.exp:1.2 Sun Aug 16 12:30:45 2020
+++ src/usr.bin/make/unit-tests/varmod-subst.exp Tue Nov 3 18:18:31 2020
@@ -9,28 +9,39 @@ mod-subst-delimiter:
1 two 3 horizontal tabulator
1 two 3 space
1 two 3 exclamation mark
-1 two 3 double quotes
-1 two 3 hash
-1 two 3 dollar
-1 two 3 percent
+1 two 3 quotation mark
+1 two 3 number sign
+1 two 3 dollar sign
+1 two 3 percent sign
+1 two 3 ampersand
1 two 3 apostrophe
-1 two 3 opening parenthesis
-1 two 3 closing parenthesis
+1 two 3 left parenthesis
+1 two 3 right parenthesis
+1 two 3 asterisk
+1 two 3 plus sign
+1 two 3 comma
+1 two 3 hyphen-minus
+1 two 3 full stop
+1 two 3 solidus
1 two 3 digit
1 two 3 colon
-1 two 3 less than sign
-1 two 3 equal sign
-1 two 3 greater than sign
+1 two 3 semicolon
+1 two 3 less-than sign
+1 two 3 equals sign
+1 two 3 greater-than sign
1 two 3 question mark
-1 two 3 at
-1 two 3 letter
-1 two 3 opening bracket
-1 two 3 backslash
-1 two 3 closing bracket
-1 two 3 caret
-1 two 3 opening brace
+1 two 3 commercial at
+1 two 3 capital letter
+1 two 3 left square bracket
+1 two 3 reverse solidus
+1 two 3 right square bracket
+1 two 3 circumflex accent
+1 two 3 low line
+1 two 3 grave accent
+1 two 3 small letter
+1 two 3 left curly bracket
1 two 3 vertical line
-1 two 3 closing brace
+1 two 3 right curly bracket
1 two 3 tilde
mod-subst-chain:
A B c.
Index: src/usr.bin/make/unit-tests/varmod-subst.mk
diff -u src/usr.bin/make/unit-tests/varmod-subst.mk:1.4 src/usr.bin/make/unit-tests/varmod-subst.mk:1.5
--- src/usr.bin/make/unit-tests/varmod-subst.mk:1.4 Sat Oct 24 08:46:08 2020
+++ src/usr.bin/make/unit-tests/varmod-subst.mk Tue Nov 3 18:18:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-subst.mk,v 1.4 2020/10/24 08:46:08 rillig Exp $
+# $NetBSD: varmod-subst.mk,v 1.5 2020/11/03 18:18:31 rillig Exp $
#
# Tests for the :S,from,to, variable modifier.
@@ -78,30 +78,41 @@ mod-subst-delimiter:
@echo ${:U1 2 3:S 2 two :Q} horizontal tabulator
@echo ${:U1 2 3:S 2 two :Q} space
@echo ${:U1 2 3:S!2!two!:Q} exclamation mark
- @echo ${:U1 2 3:S"2"two":Q} double quotes
+ @echo ${:U1 2 3:S"2"two":Q} quotation mark
# In shell command lines, the hash does not need to be escaped.
# It needs to be escaped in variable assignment lines though.
- @echo ${:U1 2 3:S#2#two#:Q} hash
- @echo ${:U1 2 3:S$2$two$:Q} dollar
- @echo ${:U1 2 3:S%2%two%:Q} percent
+ @echo ${:U1 2 3:S#2#two#:Q} number sign
+ @echo ${:U1 2 3:S$2$two$:Q} dollar sign
+ @echo ${:U1 2 3:S%2%two%:Q} percent sign
+ @echo ${:U1 2 3:S&2&two&:Q} ampersand
@echo ${:U1 2 3:S'2'two':Q} apostrophe
- @echo ${:U1 2 3:S(2(two(:Q} opening parenthesis
- @echo ${:U1 2 3:S)2)two):Q} closing parenthesis
+ @echo ${:U1 2 3:S(2(two(:Q} left parenthesis
+ @echo ${:U1 2 3:S)2)two):Q} right parenthesis
+ @echo ${:U1 2 3:S*2*two*:Q} asterisk
+ @echo ${:U1 2 3:S+2+two+:Q} plus sign
+ @echo ${:U1 2 3:S,2,two,:Q} comma
+ @echo ${:U1 2 3:S-2-two-:Q} hyphen-minus
+ @echo ${:U1 2 3:S.2.two.:Q} full stop
+ @echo ${:U1 2 3:S/2/two/:Q} solidus
@echo ${:U1 2 3:S121two1:Q} digit
@echo ${:U1 2 3:S:2:two::Q} colon
- @echo ${:U1 2 3:S<2<two<:Q} less than sign
- @echo ${:U1 2 3:S=2=two=:Q} equal sign
- @echo ${:U1 2 3:S>2>two>:Q} greater than sign
+ @echo ${:U1 2 3:S;2;two;:Q} semicolon
+ @echo ${:U1 2 3:S<2<two<:Q} less-than sign
+ @echo ${:U1 2 3:S=2=two=:Q} equals sign
+ @echo ${:U1 2 3:S>2>two>:Q} greater-than sign
@echo ${:U1 2 3:S?2?two?:Q} question mark
- @echo ${:U1 2 3:S@2@two@:Q} at
- @echo ${:U1 2 3:Sa2atwoa:Q} letter
- @echo ${:U1 2 3:S[2[two[:Q} opening bracket
- @echo ${:U1 2 3:S\2\two\:Q} backslash
- @echo ${:U1 2 3:S]2]two]:Q} closing bracket
- @echo ${:U1 2 3:S^2^two^:Q} caret
- @echo ${:U1 2 3:S{2{two{:Q} opening brace
+ @echo ${:U1 2 3:S@2@two@:Q} commercial at
+ @echo ${:U1 2 3:SA2AtwoA:Q} capital letter
+ @echo ${:U1 2 3:S[2[two[:Q} left square bracket
+ @echo ${:U1 2 3:S\2\two\:Q} reverse solidus
+ @echo ${:U1 2 3:S]2]two]:Q} right square bracket
+ @echo ${:U1 2 3:S^2^two^:Q} circumflex accent
+ @echo ${:U1 2 3:S_2_two_:Q} low line
+ @echo ${:U1 2 3:S`2`two`:Q} grave accent
+ @echo ${:U1 2 3:Sa2atwoa:Q} small letter
+ @echo ${:U1 2 3:S{2{two{:Q} left curly bracket
@echo ${:U1 2 3:S|2|two|:Q} vertical line
- @echo ${:U1 2 3:S}2}two}:Q} closing brace
+ @echo ${:U1 2 3:S}2}two}:Q} right curly bracket
@echo ${:U1 2 3:S~2~two~:Q} tilde
# The :S and :C modifiers can be chained without a separating ':'.
