Module Name: src
Committed By: rillig
Date: Thu Nov 19 21:46:10 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: Makefile opt-debug-jobs.exp
Log Message:
make(1): fix test opt-debug-jobs when compiled with dash as shell
make USER_CPPFLAGS=-DDEFSHELL_CUSTOM='\"/usr/pkg/bin/dash\"'
To generate a diff of this commit:
cvs rdiff -u -r1.209 -r1.210 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/opt-debug-jobs.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.209 src/usr.bin/make/unit-tests/Makefile:1.210
--- src/usr.bin/make/unit-tests/Makefile:1.209 Thu Nov 19 21:39:50 2020
+++ src/usr.bin/make/unit-tests/Makefile Thu Nov 19 21:46:10 2020
@@ -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,([0-9][0-
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+= \
Index: src/usr.bin/make/unit-tests/opt-debug-jobs.exp
diff -u src/usr.bin/make/unit-tests/opt-debug-jobs.exp:1.7 src/usr.bin/make/unit-tests/opt-debug-jobs.exp:1.8
--- src/usr.bin/make/unit-tests/opt-debug-jobs.exp:1.7 Thu Nov 12 21:54:52 2020
+++ src/usr.bin/make/unit-tests/opt-debug-jobs.exp Thu Nov 19 21:46:10 2020
@@ -13,7 +13,7 @@ echo ": 'single' and \"double\" quotes"
{ 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>
