Module Name: src
Committed By: rillig
Date: Sat Aug 29 19:35:39 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: Makefile sh-dots.exp
Log Message:
make(1): fix sh-dots test
The exact output depends on the shell. Some shells prefix the error
message with their name, some don't.
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/sh-dots.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.128 src/usr.bin/make/unit-tests/Makefile:1.129
--- src/usr.bin/make/unit-tests/Makefile:1.128 Sat Aug 29 19:07:32 2020
+++ src/usr.bin/make/unit-tests/Makefile Sat Aug 29 19:35:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.128 2020/08/29 19:07:32 rillig Exp $
+# $NetBSD: Makefile,v 1.129 2020/08/29 19:35:38 rillig Exp $
#
# Unit tests for make(1)
#
@@ -352,9 +352,8 @@ FLAGS.varname-empty= -dv '$${:U}=cmdline
# Some tests need extra post-processing.
SED_CMDS.opt-debug-g1= -e 's,${.CURDIR},CURDIR,'
-SED_CMDS.opt-debug-g1+= -e 's,[/[a-z]*/share/mk,/.../share/mk,'
SED_CMDS.opt-debug-g1+= -e '/Global Variables:/,/Suffixes:/d'
-SED_CMDS.sh-dots+= -e 's,^${.SHELL}: ,,' -e '/not found/s,command ,,'
+SED_CMDS.sh-dots= -e 's,^.*\.\.\.:.*,<normalized: ...: not found>,'
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/sh-dots.exp
diff -u src/usr.bin/make/unit-tests/sh-dots.exp:1.1 src/usr.bin/make/unit-tests/sh-dots.exp:1.2
--- src/usr.bin/make/unit-tests/sh-dots.exp:1.1 Sat Aug 22 11:27:02 2020
+++ src/usr.bin/make/unit-tests/sh-dots.exp Sat Aug 29 19:35:38 2020
@@ -6,7 +6,7 @@ repeated repeated
commented commented
*** Error code 1 (ignored)
... # Run the below commands later
-...: not found
+<normalized: ...: not found>
commented delayed commented
first delayed first
repeated delayed repeated
