Module Name: src
Committed By: rillig
Date: Mon Apr 12 16:09:57 UTC 2021
Modified Files:
src/usr.bin/make/unit-tests: varmod-sysv.exp varmod-sysv.mk
Log Message:
tests/make: fix test for modifier ':from=to'
I had forgotten to remove the single quotes, to produce a really empty
word. Plus I had forgotten the modifier ':Q' for the result, which
meant that the single quotes did not show up in the output.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/varmod-sysv.exp
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/make/unit-tests/varmod-sysv.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-sysv.exp
diff -u src/usr.bin/make/unit-tests/varmod-sysv.exp:1.8 src/usr.bin/make/unit-tests/varmod-sysv.exp:1.9
--- src/usr.bin/make/unit-tests/varmod-sysv.exp:1.8 Mon Apr 12 16:04:30 2021
+++ src/usr.bin/make/unit-tests/varmod-sysv.exp Mon Apr 12 16:09:57 2021
@@ -5,23 +5,23 @@ word modifier
suffix = "suffix"
prefix = "prefix"
pre-middle-suffix = "pre-middle-suffix"
-'' =NS "NS"
+'' =NS ""
suffix =NS "suffixNS"
prefix =NS "prefixNS"
pre-middle-suffix =NS "pre-middle-suffixNS"
-'' =% "%"
+'' =% ""
suffix =% "suffix%"
prefix =% "prefix%"
pre-middle-suffix =% "pre-middle-suffix%"
-'' =%NS "%NS"
+'' =%NS ""
suffix =%NS "suffix%NS"
prefix =%NS "prefix%NS"
pre-middle-suffix =%NS "pre-middle-suffix%NS"
-'' =NPre% "NPre%"
+'' =NPre% ""
suffix =NPre% "suffixNPre%"
prefix =NPre% "prefixNPre%"
pre-middle-suffix =NPre% "pre-middle-suffixNPre%"
-'' =NPre%NS "NPre%NS"
+'' =NPre%NS ""
suffix =NPre%NS "suffixNPre%NS"
prefix =NPre%NS "prefixNPre%NS"
pre-middle-suffix =NPre%NS "pre-middle-suffixNPre%NS"
@@ -53,7 +53,7 @@ pre-middle-suffix ffix=NPre%NS
suffix %= ""
prefix %= ""
pre-middle-suffix %= ""
-'' %=NS "NS"
+'' %=NS ""
suffix %=NS "NS"
prefix %=NS "NS"
pre-middle-suffix %=NS "NS"
@@ -61,15 +61,15 @@ pre-middle-suffix %=NS
suffix %=% "suffix"
prefix %=% "prefix"
pre-middle-suffix %=% "pre-middle-suffix"
-'' %=%NS "NS"
+'' %=%NS ""
suffix %=%NS "suffixNS"
prefix %=%NS "prefixNS"
pre-middle-suffix %=%NS "pre-middle-suffixNS"
-'' %=NPre% "NPre"
+'' %=NPre% ""
suffix %=NPre% "NPresuffix"
prefix %=NPre% "NPreprefix"
pre-middle-suffix %=NPre% "NPrepre-middle-suffix"
-'' %=NPre%NS "NPreNS"
+'' %=NPre%NS ""
suffix %=NPre%NS "NPresuffixNS"
prefix %=NPre%NS "NPreprefixNS"
pre-middle-suffix %=NPre%NS "NPrepre-middle-suffixNS"
Index: src/usr.bin/make/unit-tests/varmod-sysv.mk
diff -u src/usr.bin/make/unit-tests/varmod-sysv.mk:1.13 src/usr.bin/make/unit-tests/varmod-sysv.mk:1.14
--- src/usr.bin/make/unit-tests/varmod-sysv.mk:1.13 Mon Apr 12 16:04:30 2021
+++ src/usr.bin/make/unit-tests/varmod-sysv.mk Mon Apr 12 16:09:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-sysv.mk,v 1.13 2021/04/12 16:04:30 rillig Exp $
+# $NetBSD: varmod-sysv.mk,v 1.14 2021/04/12 16:09:57 rillig Exp $
#
# Tests for the variable modifier ':from=to', which replaces the suffix
# "from" with "to". It can also use '%' as a wildcard.
@@ -245,7 +245,7 @@ INDIRECT= 1:${VALUE} 2:$${VALUE} 4:$$$${
. for to in '' NS % %NS NPre% NPre%NS
. for word in '' suffix prefix pre-middle-suffix
. for mod in ${from:N''}=${to:N''}
-!=1>&2 printf '%-24s %-24s "%s"\n' ''${word:Q} ''${mod:Q} ''${word:${mod}}
+!=1>&2 printf '%-24s %-24s "%s"\n' ''${word:Q} ''${mod:Q} ''${word:N'':${mod}:Q}
. endfor
. endfor
. endfor
