Module Name: src
Committed By: rillig
Date: Thu Nov 19 23:50:26 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.210 -r1.211 src/usr.bin/make/unit-tests/Makefile
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.210 src/usr.bin/make/unit-tests/Makefile:1.211
--- src/usr.bin/make/unit-tests/Makefile:1.210 Thu Nov 19 21:46:10 2020
+++ src/usr.bin/make/unit-tests/Makefile Thu Nov 19 23:50:26 2020
@@ -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,Process
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,'
