[src/trunk]: src/usr.bin/make/unit-tests make(1): fix test output of var-op-s...

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

details:   https://anonhg.NetBSD.org/src/rev/c6ead91c7163
branches:  trunk
changeset: 946135:c6ead91c7163
user:      rillig <rillig%NetBSD.org@localhost>
date:      Tue Nov 17 20:19:24 2020 +0000

description:
make(1): fix test output of var-op-shell for dash

Dash is helpful and outputs the line number in case of an error.  The
other shells don't do this.  Accept both variants.

diffstat:

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

diffs (18 lines):

diff -r 854b505c6a67 -r c6ead91c7163 usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile  Tue Nov 17 20:16:44 2020 +0000
+++ b/usr.bin/make/unit-tests/Makefile  Tue Nov 17 20:19:24 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.203 2020/11/16 15:12:16 rillig Exp $
+# $NetBSD: Makefile,v 1.204 2020/11/17 20:19:24 rillig Exp $
 #
 # Unit tests for make(1)
 #
@@ -450,7 +450,7 @@
 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}: ,,'
+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.varmod-subst-regex+= \
                        -e 's,\(Regex compilation error:\).*,\1 (details omitted),'