[src/trunk]: src/usr.bin/make/unit-tests make(1): include line numbers in out...

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

details:   https://anonhg.NetBSD.org/src/rev/59e42cb1384c
branches:  trunk
changeset: 948211:59e42cb1384c
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Dec 20 19:37:23 2020 +0000

description:
make(1): include line numbers in output of test varmod-edge.mk

Suppressing the line numbers does not provide much benefit, given that
the test file doesn't change often.

diffstat:

 usr.bin/make/unit-tests/Makefile        |   3 +--
 usr.bin/make/unit-tests/varmod-edge.exp |  32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diffs (59 lines):

diff -r 8d395b76f5b6 -r 59e42cb1384c usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile  Sun Dec 20 19:30:03 2020 +0000
+++ b/usr.bin/make/unit-tests/Makefile  Sun Dec 20 19:37:23 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.252 2020/12/19 16:00:17 rillig Exp $
+# $NetBSD: Makefile,v 1.253 2020/12/20 19:37:23 rillig Exp $
 #
 # Unit tests for make(1)
 #
@@ -502,7 +502,6 @@
        -e 's,^${.SHELL:T}: [ 0-9:]*,,' \
        -e '/command/s,No such.*,not found,'
 SED_CMDS.vardebug+=    -e 's,${.SHELL},</path/to/shell>,'
-SED_CMDS.varmod-edge+= -e 's, line [0-9]*:, line omitted:,'
 SED_CMDS.varmod-gmtime+=       -e 's,Tue Jan 19 03:14:08 2038,<normalized>,'
 SED_CMDS.varmod-gmtime+=       ${:D FreeBSD i386 still has 32-bit time_t. }
 SED_CMDS.varmod-gmtime+=       -e 's,Fri Dec 13 20:45:52 1901,<normalized>,'
diff -r 8d395b76f5b6 -r 59e42cb1384c usr.bin/make/unit-tests/varmod-edge.exp
--- a/usr.bin/make/unit-tests/varmod-edge.exp   Sun Dec 20 19:30:03 2020 +0000
+++ b/usr.bin/make/unit-tests/varmod-edge.exp   Sun Dec 20 19:37:23 2020 +0000
@@ -1,22 +1,22 @@
-make: "varmod-edge.mk" line omitted: ok M-paren
-make: "varmod-edge.mk" line omitted: ok M-mixed
-make: "varmod-edge.mk" line omitted: ok M-unescape
+make: "varmod-edge.mk" line 166: ok M-paren
+make: "varmod-edge.mk" line 166: ok M-mixed
+make: "varmod-edge.mk" line 166: ok M-unescape
 make: Unclosed variable specification (expecting '}') for "" (value "*)") modifier U
-make: "varmod-edge.mk" line omitted: ok M-nest-mix
-make: "varmod-edge.mk" line omitted: ok M-nest-brk
-make: "varmod-edge.mk" line omitted: ok M-pat-err
-make: "varmod-edge.mk" line omitted: ok M-bsbs
-make: "varmod-edge.mk" line omitted: ok M-bs1-par
-make: "varmod-edge.mk" line omitted: ok M-bs2-par
-make: "varmod-edge.mk" line omitted: ok M-128
-make: "varmod-edge.mk" line omitted: ok eq-ext
-make: "varmod-edge.mk" line omitted: ok eq-q
-make: "varmod-edge.mk" line omitted: ok eq-bs
+make: "varmod-edge.mk" line 166: ok M-nest-mix
+make: "varmod-edge.mk" line 166: ok M-nest-brk
+make: "varmod-edge.mk" line 166: ok M-pat-err
+make: "varmod-edge.mk" line 166: ok M-bsbs
+make: "varmod-edge.mk" line 166: ok M-bs1-par
+make: "varmod-edge.mk" line 166: ok M-bs2-par
+make: "varmod-edge.mk" line 166: ok M-128
+make: "varmod-edge.mk" line 166: ok eq-ext
+make: "varmod-edge.mk" line 166: ok eq-q
+make: "varmod-edge.mk" line 166: ok eq-bs
 make: Unfinished modifier for INP.eq-esc ('=' missing)
-make: "varmod-edge.mk" line omitted: ok eq-esc
-make: "varmod-edge.mk" line omitted: ok colon
+make: "varmod-edge.mk" line 166: ok eq-esc
+make: "varmod-edge.mk" line 166: ok colon
 make: Unknown modifier ':'
 make: Unknown modifier ':'
-make: "varmod-edge.mk" line omitted: ok colons
+make: "varmod-edge.mk" line 166: ok colons
 ok
 exit status 0