[src/trunk]: src/usr.bin/make/unit-tests make: reduce debug logging and memor...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c36a03934f75
branches:  trunk
changeset: 378344:c36a03934f75
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Apr 10 22:09:54 2021 +0000

description:
make: reduce debug logging and memory allocation for ${:U...}

Expressions of the form ${:U...} are often generated by .for loops.
Since these expressions are not generated knowingly by the make user, do
not fill the debug log with them since that would interrupt the normal
reading flow of the -dv log for nested expressions.

diffstat:

 usr.bin/make/unit-tests/vardebug.exp            |  12 ------------
 usr.bin/make/unit-tests/varmod-indirect.exp     |  18 ------------------
 usr.bin/make/unit-tests/varmod-match-escape.exp |   6 ------
 usr.bin/make/unit-tests/varname-empty.exp       |  18 ------------------
 usr.bin/make/unit-tests/varname.exp             |   3 ---
 5 files changed, 0 insertions(+), 57 deletions(-)

diffs (150 lines):

diff -r dd28e1909ae6 -r c36a03934f75 usr.bin/make/unit-tests/vardebug.exp
--- a/usr.bin/make/unit-tests/vardebug.exp      Sat Apr 10 22:09:53 2021 +0000
+++ b/usr.bin/make/unit-tests/vardebug.exp      Sat Apr 10 22:09:54 2021 +0000
@@ -5,13 +5,7 @@ Global: VAR = added
 Global: VAR = overwritten
 Global:delete VAR
 Global:delete VAR (not found)
-Var_Parse: ${:U} (eval)
-Evaluating modifier ${:U} on value "" (eval, undefined)
-Result of ${:U} is "" (eval, defined)
 Var_Set("${:U}", "empty name", ...) name expands to empty string - ignored
-Var_Parse: ${:U} (eval)
-Evaluating modifier ${:U} on value "" (eval, undefined)
-Result of ${:U} is "" (eval, defined)
 Var_Append("${:U}", "empty name", ...) name expands to empty string - ignored
 Global: FROM_CMDLINE = overwritten ignored!
 Global: VAR = 1
@@ -46,9 +40,6 @@ Result of ${VAR:Q} is "1\ 2\ 3"
 Var_Parse: ${:Uvalue:${:UM*e}:Mvalu[e]} (eval-defined)
 Evaluating modifier ${:U...} on value "" (eval-defined, undefined)
 Result of ${:Uvalue} is "value" (eval-defined, defined)
-Var_Parse: ${:UM*e}:Mvalu[e]} (eval-defined)
-Evaluating modifier ${:U...} on value "" (eval-defined, undefined)
-Result of ${:UM*e} is "M*e" (eval-defined, defined)
 Indirect modifier "M*e" from "${:UM*e}"
 Evaluating modifier ${:M...} on value "value" (eval-defined, defined)
 Pattern for ':M' is "*e"
@@ -58,9 +49,6 @@ Evaluating modifier ${:M...} on value "v
 Pattern for ':M' is "valu[e]"
 ModifyWords: split "value" into 1 words
 Result of ${:Mvalu[e]} is "value" (eval-defined, defined)
-Var_Parse: ${:UVAR} (eval)
-Evaluating modifier ${:U...} on value "" (eval, undefined)
-Result of ${:UVAR} is "VAR" (eval, defined)
 Global:delete VAR
 Var_Parse: ${:Uvariable:unknown} (eval-defined)
 Evaluating modifier ${:U...} on value "" (eval-defined, undefined)
diff -r dd28e1909ae6 -r c36a03934f75 usr.bin/make/unit-tests/varmod-indirect.exp
--- a/usr.bin/make/unit-tests/varmod-indirect.exp       Sat Apr 10 22:09:53 2021 +0000
+++ b/usr.bin/make/unit-tests/varmod-indirect.exp       Sat Apr 10 22:09:54 2021 +0000
@@ -16,41 +16,23 @@ Var_Parse: ${UNDEF} after (eval-keep-dol
 Global: _ = before ${UNDEF} after
 ParseReadLine (169): '_:=      before ${UNDEF:${:US,a,a,}} after'
 Var_Parse: ${UNDEF:${:US,a,a,}} after (eval-keep-dollar-and-undefined)
-Var_Parse: ${:US,a,a,}} after (eval-keep-dollar-and-undefined)
-Evaluating modifier ${:U...} on value "" (eval-keep-dollar-and-undefined, undefined)
-Result of ${:US,a,a,} is "S,a,a," (eval-keep-dollar-and-undefined, defined)
 Indirect modifier "S,a,a," from "${:US,a,a,}"
 Evaluating modifier ${UNDEF:S...} on value "" (eval-keep-dollar-and-undefined, undefined)
 Modifier part: "a"
 Modifier part: "a"
 ModifyWords: split "" into 1 words
 Result of ${UNDEF:S,a,a,} is "" (eval-keep-dollar-and-undefined, undefined)
-Var_Parse: ${:US,a,a,}} after (eval-keep-dollar-and-undefined)
-Evaluating modifier ${:U...} on value "" (eval-keep-dollar-and-undefined, undefined)
-Result of ${:US,a,a,} is "S,a,a," (eval-keep-dollar-and-undefined, defined)
 Global: _ = before ${UNDEF:S,a,a,} after
 ParseReadLine (179): '_:=      before ${UNDEF:${:U}} after'
 Var_Parse: ${UNDEF:${:U}} after (eval-keep-dollar-and-undefined)
-Var_Parse: ${:U}} after (eval-keep-dollar-and-undefined)
-Evaluating modifier ${:U} on value "" (eval-keep-dollar-and-undefined, undefined)
-Result of ${:U} is "" (eval-keep-dollar-and-undefined, defined)
 Indirect modifier "" from "${:U}"
-Var_Parse: ${:U}} after (eval-keep-dollar-and-undefined)
-Evaluating modifier ${:U} on value "" (eval-keep-dollar-and-undefined, undefined)
-Result of ${:U} is "" (eval-keep-dollar-and-undefined, defined)
 Global: _ = before ${UNDEF:} after
 ParseReadLine (184): '_:=      before ${UNDEF:${:UZ}} after'
 Var_Parse: ${UNDEF:${:UZ}} after (eval-keep-dollar-and-undefined)
-Var_Parse: ${:UZ}} after (eval-keep-dollar-and-undefined)
-Evaluating modifier ${:U...} on value "" (eval-keep-dollar-and-undefined, undefined)
-Result of ${:UZ} is "Z" (eval-keep-dollar-and-undefined, defined)
 Indirect modifier "Z" from "${:UZ}"
 Evaluating modifier ${UNDEF:Z} on value "" (eval-keep-dollar-and-undefined, undefined)
 make: "varmod-indirect.mk" line 184: Unknown modifier "Z"
 Result of ${UNDEF:Z} is error (eval-keep-dollar-and-undefined, undefined)
-Var_Parse: ${:UZ}} after (eval-keep-dollar-and-undefined)
-Evaluating modifier ${:U...} on value "" (eval-keep-dollar-and-undefined, undefined)
-Result of ${:UZ} is "Z" (eval-keep-dollar-and-undefined, defined)
 Global: _ = before ${UNDEF:Z} after
 ParseReadLine (186): '.MAKEFLAGS: -d0'
 ParseDependency(.MAKEFLAGS: -d0)
diff -r dd28e1909ae6 -r c36a03934f75 usr.bin/make/unit-tests/varmod-match-escape.exp
--- a/usr.bin/make/unit-tests/varmod-match-escape.exp   Sat Apr 10 22:09:53 2021 +0000
+++ b/usr.bin/make/unit-tests/varmod-match-escape.exp   Sat Apr 10 22:09:54 2021 +0000
@@ -2,17 +2,11 @@ Global: SPECIALS = \: : \\ * \*
 CondParser_Eval: ${SPECIALS:M${:U}\:} != ${SPECIALS:M\:${:U}}
 Var_Parse: ${SPECIALS:M${:U}\:} != ${SPECIALS:M\:${:U}} (eval-defined)
 Evaluating modifier ${SPECIALS:M...} on value "\: : \\ * \*"
-Var_Parse: ${:U}\: (eval-defined)
-Evaluating modifier ${:U} on value "" (eval-defined, undefined)
-Result of ${:U} is "" (eval-defined, defined)
 Pattern for ':M' is "\:"
 ModifyWords: split "\: : \\ * \*" into 5 words
 Result of ${SPECIALS:M${:U}\:} is ":"
 Var_Parse: ${SPECIALS:M\:${:U}} (eval-defined)
 Evaluating modifier ${SPECIALS:M...} on value "\: : \\ * \*"
-Var_Parse: ${:U} (eval-defined)
-Evaluating modifier ${:U} on value "" (eval-defined, undefined)
-Result of ${:U} is "" (eval-defined, defined)
 Pattern for ':M' is ":"
 ModifyWords: split "\: : \\ * \*" into 5 words
 Result of ${SPECIALS:M\:${:U}} is ":"
diff -r dd28e1909ae6 -r c36a03934f75 usr.bin/make/unit-tests/varname-empty.exp
--- a/usr.bin/make/unit-tests/varname-empty.exp Sat Apr 10 22:09:53 2021 +0000
+++ b/usr.bin/make/unit-tests/varname-empty.exp Sat Apr 10 22:09:54 2021 +0000
@@ -1,6 +1,3 @@
-Var_Parse: ${:U} (eval)
-Evaluating modifier ${:U} on value "" (eval, undefined)
-Result of ${:U} is "" (eval, defined)
 Var_Set("${:U}", "cmdline-u", ...) name expands to empty string - ignored
 Var_Set("", "cmdline-plain", ...) name expands to empty string - ignored
 Global: .CURDIR = <curdir>
@@ -23,23 +20,8 @@ SetVar: variable name is empty - ignored
 Var_Set("", "", ...) name expands to empty string - ignored
 Var_Set("", "subst", ...) name expands to empty string - ignored
 Var_Set("", "shell-output", ...) name expands to empty string - ignored
-Var_Parse: ${:Ufallback} != "fallback" (eval-defined)
-Evaluating modifier ${:U...} on value "" (eval-defined, undefined)
-Result of ${:Ufallback} is "fallback" (eval-defined, defined)
-Var_Parse: ${:U} (eval)
-Evaluating modifier ${:U} on value "" (eval, undefined)
-Result of ${:U} is "" (eval, defined)
 Var_Set("${:U}", "assigned indirectly", ...) name expands to empty string - ignored
-Var_Parse: ${:Ufallback} != "fallback" (eval-defined)
-Evaluating modifier ${:U...} on value "" (eval-defined, undefined)
-Result of ${:Ufallback} is "fallback" (eval-defined, defined)
-Var_Parse: ${:U} (eval)
-Evaluating modifier ${:U} on value "" (eval, undefined)
-Result of ${:U} is "" (eval, defined)
 Var_Append("${:U}", "appended indirectly", ...) name expands to empty string - ignored
-Var_Parse: ${:Ufallback} != "fallback" (eval-defined)
-Evaluating modifier ${:U...} on value "" (eval-defined, undefined)
-Result of ${:Ufallback} is "fallback" (eval-defined, defined)
 Global: .MAKEFLAGS =  -r -d v -d
 Global: .MAKEFLAGS =  -r -d v -d 0
 out: fallback
diff -r dd28e1909ae6 -r c36a03934f75 usr.bin/make/unit-tests/varname.exp
--- a/usr.bin/make/unit-tests/varname.exp       Sat Apr 10 22:09:53 2021 +0000
+++ b/usr.bin/make/unit-tests/varname.exp       Sat Apr 10 22:09:54 2021 +0000
@@ -4,9 +4,6 @@ Global: VARNAME = VAR(((
 Var_Parse: ${VARNAME} (eval)
 Global: VAR((( = 3 open parentheses
 Var_Parse: ${VAR(((}}}}" != "3 open parentheses}}}" (eval)
-Var_Parse: ${:UVAR(((}=        try1 (eval-defined)
-Evaluating modifier ${:U...} on value "" (eval-defined, undefined)
-Result of ${:UVAR(((} is "VAR(((" (eval-defined, defined)
 Global: .ALLTARGETS =  VAR(((=)
 make: "varname.mk" line 30: No closing parenthesis in archive specification
 make: "varname.mk" line 30: Error in archive specification: "VAR"