diff options
| author | rillig <rillig@NetBSD.org> | 2020-10-30 15:03:58 +0000 |
|---|---|---|
| committer | rillig <rillig@NetBSD.org> | 2020-10-30 15:03:58 +0000 |
| commit | dade35fd20499538f2b4cd078a7ad3545d70b3ff (patch) | |
| tree | ce0c05a6b62a54d7a4154cc7594c7e8fb8eb596b /usr.bin/make/unit-tests/Makefile | |
| parent | 49cec7dc1c9ef2eb8c0c935a43ccba03b4303e3b (diff) | |
make(1): move test flags for varname-dot-shell to the test itself
Diffstat (limited to 'usr.bin/make/unit-tests/Makefile')
| -rw-r--r-- | usr.bin/make/unit-tests/Makefile | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/usr.bin/make/unit-tests/Makefile b/usr.bin/make/unit-tests/Makefile index ae06bbd0d9e..1194e7d5b30 100644 --- a/usr.bin/make/unit-tests/Makefile +++ b/usr.bin/make/unit-tests/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.176 2020/10/29 18:19:41 rillig Exp $ +# $NetBSD: Makefile,v 1.177 2020/10/30 15:03:58 rillig Exp $ # # Unit tests for make(1) # @@ -398,7 +398,6 @@ FLAGS.order= -j1 FLAGS.recursive= -dL FLAGS.sh-leading-plus= -n FLAGS.varmod-match-escape= -dv -FLAGS.varname-dot-shell= -dpv FLAGS.varname-empty= -dv '$${:U}=cmdline-u' '=cmline-plain' # Some tests need extra postprocessing. @@ -431,17 +430,15 @@ SED_CMDS.varshell+= -e 's,^${.SHELL:T}: ,,' SED_CMDS.varshell+= -e '/command/s,No such.*,not found,' SED_CMDS.varname-dot-parsedir= -e '/in some cases/ s,^make: "[^"]*,make: "<normalized>,' SED_CMDS.varname-dot-parsefile= -e '/in some cases/ s,^make: "[^"]*,make: "<normalized>,' -SED_CMDS.varname-dot-shell= -e 's, = /.*, = (details omitted),' -SED_CMDS.varname-dot-shell+= -e 's,"/[^"]*","(details omitted)",' -SED_CMDS.varname-dot-shell+= -e 's,\[/[^]]*\],[(details omitted)],' +SED_CMDS.varname-dot-shell= -e 's, = /[^ ]*, = (details omitted),g' +SED_CMDS.varname-dot-shell+= -e 's,"/[^" ]*","(details omitted)",g' +SED_CMDS.varname-dot-shell+= -e 's,\[/[^] ]*\],[(details omitted)],g' # Some tests need an additional round of postprocessing. POSTPROC.deptgt-suffixes= \ ${TOOL_SED} -n -e '/^\#\*\*\* Suffixes/,/^\#\*/p' POSTPROC.varmod-match-escape= ${TOOL_SED} -n -e '/^Pattern/p' POSTPROC.varname= ${TOOL_SED} -n -e '/^MAGIC/p' -e '/^ORDER_/p' -POSTPROC.varname-dot-shell= \ - awk '/\.SHELL/ || /^ParseReadLine/' POSTPROC.varname-empty= ${TOOL_SED} -n -e '/^Var_Set/p' -e '/^out:/p' # Some tests reuse other tests, which makes them unnecessarily fragile. |
