Module Name: src
Committed By: rillig
Date: Sun Dec 5 22:37:58 UTC 2021
Modified Files:
src/usr.bin/make/unit-tests: varmod-unique.mk
Log Message:
tests/make: replace ':U' with ':L' in test for ':u'
In expressions using ':L', the value of the variable is delimited by
'{', which makes it easier to recognize it visually, as opposed to being
delimited by 'U'.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/varmod-unique.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-unique.mk
diff -u src/usr.bin/make/unit-tests/varmod-unique.mk:1.5 src/usr.bin/make/unit-tests/varmod-unique.mk:1.6
--- src/usr.bin/make/unit-tests/varmod-unique.mk:1.5 Sun May 30 20:26:41 2021
+++ src/usr.bin/make/unit-tests/varmod-unique.mk Sun Dec 5 22:37:58 2021
@@ -1,47 +1,46 @@
-# $NetBSD: varmod-unique.mk,v 1.5 2021/05/30 20:26:41 rillig Exp $
+# $NetBSD: varmod-unique.mk,v 1.6 2021/12/05 22:37:58 rillig Exp $
#
# Tests for the :u variable modifier, which discards adjacent duplicate
# words.
-.if ${:U1 2 1:u} != "1 2 1"
-. warning The :u modifier only merges _adjacent_ duplicate words.
+.if ${1 2 1:L:u} != "1 2 1"
+. warning The modifier ':u' only merges _adjacent_ duplicate words.
.endif
-.if ${:U1 2 2 3:u} != "1 2 3"
-. warning The :u modifier must merge adjacent duplicate words.
+.if ${1 2 2 3:L:u} != "1 2 3"
+. warning The modifier ':u' must merge adjacent duplicate words.
.endif
-.if ${:U:u} != ""
-. warning The :u modifier must do nothing with an empty word list.
+.if ${:L:u} != ""
+. warning The modifier ':u' must do nothing with an empty word list.
.endif
-.if ${:U :u} != ""
+.if ${ :L:u} != ""
. warning The modifier ':u' must normalize the whitespace.
.endif
-.if ${:Uword:u} != "word"
-. warning The :u modifier must do nothing with a single-element word list.
+.if ${word:L:u} != "word"
+. warning The modifier ':u' must do nothing with a single-element word list.
.endif
-.if ${:U word :u} != "word"
+.if ${ word :L:u} != "word"
. warning The modifier ':u' must normalize the whitespace.
.endif
-.if ${:U1 1 1 1 1 1 1 1:u} != "1"
-. warning The :u modifier must merge _all_ adjacent duplicate words.
+.if ${1 1 1 1 1 1 1 1:L:u} != "1"
+. warning The modifier ':u' must merge _all_ adjacent duplicate words.
.endif
-.if ${:U 1 2 1 1 :u} != "1 2 1"
-. warning The :u modifier must normalize whitespace between the words.
+.if ${ 1 2 1 1 :L:u} != "1 2 1"
+. warning The modifier ':u' must normalize whitespace between the words.
.endif
-.if ${:U1 1 1 1 2:u} != "1 2"
+.if ${1 1 1 1 2:L:u} != "1 2"
. warning Duplicate words at the beginning must be merged.
.endif
-.if ${:U1 2 2 2 2:u} != "1 2"
+.if ${1 2 2 2 2:L:u} != "1 2"
. warning Duplicate words at the end must be merged.
.endif
all:
- @:;
