Module Name: src Committed By: rillig Date: Tue Nov 17 20:19:24 UTC 2020
Modified Files: src/usr.bin/make/unit-tests: Makefile Log Message: make(1): fix test output of var-op-shell for dash Dash is helpful and outputs the line number in case of an error. The other shells don't do this. Accept both variants. To generate a diff of this commit: cvs rdiff -u -r1.203 -r1.204 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.203 src/usr.bin/make/unit-tests/Makefile:1.204 --- src/usr.bin/make/unit-tests/Makefile:1.203 Mon Nov 16 15:12:16 2020 +++ src/usr.bin/make/unit-tests/Makefile Tue Nov 17 20:19:24 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.203 2020/11/16 15:12:16 rillig Exp $ +# $NetBSD: Makefile,v 1.204 2020/11/17 20:19:24 rillig Exp $ # # Unit tests for make(1) # @@ -450,7 +450,7 @@ SED_CMDS.opt-debug-jobs+= -e 's,Process 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.var-op-shell+= -e 's,^${.SHELL:T}: ,,' +SED_CMDS.var-op-shell+= -e 's,^${.SHELL:T}: [ 0-9:]*,,' SED_CMDS.var-op-shell+= -e '/command/s,No such.*,not found,' SED_CMDS.varmod-subst-regex+= \ -e 's,\(Regex compilation error:\).*,\1 (details omitted),'