[src/trunk]: src/usr.bin/make/unit-tests make(1): fix test opt-debug-jobs for...

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

details:   https://anonhg.NetBSD.org/src/rev/0371c27cabf1
branches:  trunk
changeset: 946168:0371c27cabf1
user:      rillig <rillig%NetBSD.org@localhost>
date:      Thu Nov 19 23:50:26 2020 +0000

description:
make(1): fix test opt-debug-jobs for native shell

Even after substituting the actual shell name with <shell>, the trailing
optional -q option needs to be normalized.

diffstat:

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

diffs (18 lines):

diff -r 847ea1cdee80 -r 0371c27cabf1 usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile  Thu Nov 19 22:03:16 2020 +0000
+++ b/usr.bin/make/unit-tests/Makefile  Thu Nov 19 23:50:26 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.210 2020/11/19 21:46:10 rillig Exp $
+# $NetBSD: Makefile,v 1.211 2020/11/19 23:50:26 rillig Exp $
 #
 # Unit tests for make(1)
 #
@@ -456,7 +456,7 @@
 SED_CMDS.opt-debug-jobs+=      -e 's,JobFinish: [0-9][0-9]*,JobFinish: <pid>,'
 SED_CMDS.opt-debug-jobs+=      -e 's,Command: ${.SHELL:T},Command: <shell>,'
 # 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.opt-debug-jobs+=      -e 's,^\(.Command: <shell>\) -q,\1,'
 SED_CMDS.var-op-shell+=        \
        -e 's,^${.SHELL:T}: [ 0-9:]*,,' \
        -e '/command/s,No such.*,not found,'