[src/trunk]: src/usr.bin/make/unit-tests Cleanup - colliding fixes for same i...

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

details:   https://anonhg.NetBSD.org/src/rev/68961013a2cd
branches:  trunk
changeset: 946143:68961013a2cd
user:      sjg <sjg%NetBSD.org@localhost>
date:      Wed Nov 18 04:10:34 2020 +0000

description:
Cleanup - colliding fixes for same issue

diffstat:

 usr.bin/make/unit-tests/Makefile |  13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diffs (34 lines):

diff -r f657fbe34a00 -r 68961013a2cd usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile  Wed Nov 18 03:40:50 2020 +0000
+++ b/usr.bin/make/unit-tests/Makefile  Wed Nov 18 04:10:34 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.206 2020/11/18 01:12:00 sjg Exp $
+# $NetBSD: Makefile,v 1.207 2020/11/18 04:10:34 sjg Exp $
 #
 # Unit tests for make(1)
 #
@@ -428,7 +428,7 @@
 
 # Some tests need extra postprocessing.
 SED_CMDS.export= \
-       -e '/^[^=_A-Za-z0-9]*=/d'
+       -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}
@@ -459,11 +459,10 @@
 SED_CMDS.opt-debug-jobs+=      -e 's,JobFinish: [0-9][0-9]*,JobFinish: <pid>,'
 # 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,^[1-9]: ,,;s,No such.*,not found,; }'
-SED_CMDS.vardebug= \
-       ${:D canonicalize .SHELL } \
-       -e 's,${.SHELL},/bin/sh,'
+SED_CMDS.var-op-shell+=        \
+       -e 's,^${.SHELL:T}: [ 0-9:]*,,' \
+       -e 's,^${.SHELL:T}: ,,' \
+       -e '/command/s,No such.*,not found,'
 SED_CMDS.vardebug+=    -e 's,${.SHELL},</path/to/shell>,'
 SED_CMDS.varmod-subst-regex+= \
                        -e 's,\(Regex compilation error:\).*,\1 (details omitted),'