Module Name: src
Committed By: rillig
Date: Sat Aug 29 10:52:47 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: Makefile opt-debug-g1.exp
Log Message:
make(1): fix test opt-debug-g1
Including the directory cache made the test output fragile.
To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/opt-debug-g1.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.124 src/usr.bin/make/unit-tests/Makefile:1.125
--- src/usr.bin/make/unit-tests/Makefile:1.124 Fri Aug 28 15:40:53 2020
+++ src/usr.bin/make/unit-tests/Makefile Sat Aug 29 10:52:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.124 2020/08/28 15:40:53 rillig Exp $
+# $NetBSD: Makefile,v 1.125 2020/08/29 10:52:47 rillig Exp $
#
# Unit tests for make(1)
#
@@ -350,7 +350,7 @@ 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/,/Directory Cache/d'
+SED_CMDS.opt-debug-g1+= -e '/Global Variables:/,/Suffixes:/d'
SED_CMDS.sh-dots+= -e 's,^${.SHELL}: ,,' -e '/not found/s,command ,,'
SED_CMDS.varmod-subst-regex+= \
-e 's,\(Regex compilation error:\).*,\1 (details omitted),'
Index: src/usr.bin/make/unit-tests/opt-debug-g1.exp
diff -u src/usr.bin/make/unit-tests/opt-debug-g1.exp:1.1 src/usr.bin/make/unit-tests/opt-debug-g1.exp:1.2
--- src/usr.bin/make/unit-tests/opt-debug-g1.exp:1.1 Thu Aug 27 19:00:17 2020
+++ src/usr.bin/make/unit-tests/opt-debug-g1.exp Sat Aug 29 10:52:47 2020
@@ -11,12 +11,5 @@
#
# Files that are only sources:
# unmade-sources [unmade-sources]
-# Stats: 0 hits 2 misses 0 near misses 0 losers (0%)
-# directory referenced hits
-# CURDIR 2 0
-# . 2 0
-# /.../share/mk 1 0
-
-#*** Suffixes:
#*** Transformations:
exit status 0
