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

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

details:   https://anonhg.NetBSD.org/src/rev/9309721f4d39
branches:  trunk
changeset: 955696:9309721f4d39
user:      rillig <rillig%NetBSD.org@localhost>
date:      Thu Oct 08 17:54:20 2020 +0000

description:
make(1): fix test opt-debug-jobs on non-native platforms

diffstat:

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

diffs (30 lines):

diff -r eef5b580784d -r 9309721f4d39 usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile  Thu Oct 08 16:00:09 2020 +0000
+++ b/usr.bin/make/unit-tests/Makefile  Thu Oct 08 17:54:20 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.162 2020/10/05 19:27:48 rillig Exp $
+# $NetBSD: Makefile,v 1.163 2020/10/08 17:54:20 rillig Exp $
 #
 # Unit tests for make(1)
 #
@@ -414,6 +414,8 @@
 SED_CMDS.opt-debug-jobs+=      -e 's,pid [0-9][0-9]*,pid <pid>,'
 SED_CMDS.opt-debug-jobs+=      -e 's,Process [0-9][0-9]*,Process <pid>,'
 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.varmod-subst-regex+= \
                        -e 's,\(Regex compilation error:\).*,\1 (details omitted),'
 SED_CMDS.varmod-edge+= -e 's, line [0-9]*:, line omitted:,'
diff -r eef5b580784d -r 9309721f4d39 usr.bin/make/unit-tests/opt-debug-jobs.exp
--- a/usr.bin/make/unit-tests/opt-debug-jobs.exp        Thu Oct 08 16:00:09 2020 +0000
+++ b/usr.bin/make/unit-tests/opt-debug-jobs.exp        Thu Oct 08 17:54:20 2020 +0000
@@ -11,7 +11,7 @@
 { : 'single' and "double" quotes 
 } || exit $?
 Running all locally
-       Command: sh -q 
+       Command: sh 
 JobExec(all): pid <pid> added to jobs table
 job table @ job started
 job 0, status 3, flags 0, pid <pid>