Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/make/unit-tests make(1): fix test opt-debug-g1
details: https://anonhg.NetBSD.org/src/rev/53fb93881ba2
branches: trunk
changeset: 937955:53fb93881ba2
user: rillig <rillig%NetBSD.org@localhost>
date: Sat Aug 29 10:52:47 2020 +0000
description:
make(1): fix test opt-debug-g1
Including the directory cache made the test output fragile.
diffstat:
usr.bin/make/unit-tests/Makefile | 4 ++--
usr.bin/make/unit-tests/opt-debug-g1.exp | 7 -------
2 files changed, 2 insertions(+), 9 deletions(-)
diffs (34 lines):
diff -r a1127d748515 -r 53fb93881ba2 usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile Sat Aug 29 10:41:12 2020 +0000
+++ b/usr.bin/make/unit-tests/Makefile Sat Aug 29 10:52:47 2020 +0000
@@ -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 @@
# 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),'
diff -r a1127d748515 -r 53fb93881ba2 usr.bin/make/unit-tests/opt-debug-g1.exp
--- a/usr.bin/make/unit-tests/opt-debug-g1.exp Sat Aug 29 10:41:12 2020 +0000
+++ b/usr.bin/make/unit-tests/opt-debug-g1.exp Sat Aug 29 10:52:47 2020 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index