[src/trunk]: src/usr.bin/make/unit-tests Some tests need help with dash

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

details:   https://anonhg.NetBSD.org/src/rev/1b6e82a69e5e
branches:  trunk
changeset: 957118:1b6e82a69e5e
user:      sjg <sjg%NetBSD.org@localhost>
date:      Wed Nov 18 01:12:00 2020 +0000

description:
Some tests need help with dash

diffstat:

 usr.bin/make/unit-tests/Makefile |  16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diffs (37 lines):

diff -r 47b70de041e3 -r 1b6e82a69e5e usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile  Wed Nov 18 01:06:59 2020 +0000
+++ b/usr.bin/make/unit-tests/Makefile  Wed Nov 18 01:12:00 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.205 2020/11/17 20:27:35 rillig Exp $
+# $NetBSD: Makefile,v 1.206 2020/11/18 01:12:00 sjg Exp $
 #
 # Unit tests for make(1)
 #
@@ -427,6 +427,15 @@
 FLAGS.varname-empty=   -dv '$${:U}=cmdline-u' '=cmdline-plain'
 
 # Some tests need extra postprocessing.
+SED_CMDS.export= \
+       -e '/^[^=_A-Za-z0-9]*=/d'
+# these all share the same requirement
+.for t in export-all export-env
+SED_CMDS.$t= ${SED_CMDS.export}
+.endfor
+SED_CMDS.directive-export-gmake= \
+       ${:D dash is a pain } \
+       -e /non-zero/d
 SED_CMDS.job-output-long-lines= \
        ${:D Job separators on their own line are ok. } \
        -e '/^--- job-[ab] ---$$/d' \
@@ -451,7 +460,10 @@
 # The "-q" may be there or not, see jobs.c, variable shells.
 SED_CMDS.opt-debug-jobs+=      -e 's,^\(.Command: sh\) -q,\1,'
 SED_CMDS.var-op-shell+=        -e 's,^${.SHELL:T}: [ 0-9:]*,,'
-SED_CMDS.var-op-shell+=        -e '/command/s,No such.*,not found,'
+SED_CMDS.var-op-shell+=        -e '/command/{ s,^[1-9]: ,,;s,No such.*,not found,; }'
+SED_CMDS.vardebug= \
+       ${:D canonicalize .SHELL } \
+       -e 's,${.SHELL},/bin/sh,'
 SED_CMDS.vardebug+=    -e 's,${.SHELL},</path/to/shell>,'
 SED_CMDS.varmod-subst-regex+= \
                        -e 's,\(Regex compilation error:\).*,\1 (details omitted),'