Module Name: src
Committed By: rillig
Date: Thu Oct 8 17:54:20 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: Makefile opt-debug-jobs.exp
Log Message:
make(1): fix test opt-debug-jobs on non-native platforms
To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.4 -r1.5 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.162 src/usr.bin/make/unit-tests/Makefile:1.163
--- src/usr.bin/make/unit-tests/Makefile:1.162 Mon Oct 5 19:27:48 2020
+++ src/usr.bin/make/unit-tests/Makefile Thu Oct 8 17:54:20 2020
@@ -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,([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>,'
+# 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:,'
Index: src/usr.bin/make/unit-tests/opt-debug-jobs.exp
diff -u src/usr.bin/make/unit-tests/opt-debug-jobs.exp:1.4 src/usr.bin/make/unit-tests/opt-debug-jobs.exp:1.5
--- src/usr.bin/make/unit-tests/opt-debug-jobs.exp:1.4 Mon Oct 5 19:27:48 2020
+++ src/usr.bin/make/unit-tests/opt-debug-jobs.exp Thu Oct 8 17:54:20 2020
@@ -11,7 +11,7 @@ echo ": 'single' and \"double\" quotes"
{ : '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>
