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

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

details:   https://anonhg.NetBSD.org/src/rev/fc72fc4d1f81
branches:  trunk
changeset: 957140:fc72fc4d1f81
user:      rillig <rillig%NetBSD.org@localhost>
date:      Thu Nov 19 21:46:10 2020 +0000

description:
make(1): fix test opt-debug-jobs when compiled with dash as shell

make USER_CPPFLAGS=-DDEFSHELL_CUSTOM='\"/usr/pkg/bin/dash\"'

diffstat:

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

diffs (29 lines):

diff -r 9abd260e2bd0 -r fc72fc4d1f81 usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile  Thu Nov 19 21:39:50 2020 +0000
+++ b/usr.bin/make/unit-tests/Makefile  Thu Nov 19 21:46:10 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.209 2020/11/19 21:39:50 rillig Exp $
+# $NetBSD: Makefile,v 1.210 2020/11/19 21:46:10 rillig Exp $
 #
 # Unit tests for make(1)
 #
@@ -454,6 +454,7 @@
 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>,'
+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.var-op-shell+=        \
diff -r 9abd260e2bd0 -r fc72fc4d1f81 usr.bin/make/unit-tests/opt-debug-jobs.exp
--- a/usr.bin/make/unit-tests/opt-debug-jobs.exp        Thu Nov 19 21:39:50 2020 +0000
+++ b/usr.bin/make/unit-tests/opt-debug-jobs.exp        Thu Nov 19 21:46:10 2020 +0000
@@ -13,7 +13,7 @@
 { sleep 1 
 } || exit $?
 Running all
-       Command: sh 
+       Command: <shell> 
 JobExec(all): pid <pid> added to jobs table
 job table @ job started
 job 0, status 3, flags 0, pid <pid>