From 1421342aa609cf9829465e3351713dd864a91816 Mon Sep 17 00:00:00 2001 From: rillig Date: Sat, 29 Aug 2020 10:52:47 +0000 Subject: [PATCH] make(1): fix test opt-debug-g1 Including the directory cache made the test output fragile. --- usr.bin/make/unit-tests/Makefile | 4 ++-- usr.bin/make/unit-tests/opt-debug-g1.exp | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/usr.bin/make/unit-tests/Makefile b/usr.bin/make/unit-tests/Makefile index bc896688b93f..20cbe3ffc7c8 100644 --- a/usr.bin/make/unit-tests/Makefile +++ b/usr.bin/make/unit-tests/Makefile @@ -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-u' '=cmline-plain' # 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 --git a/usr.bin/make/unit-tests/opt-debug-g1.exp b/usr.bin/make/unit-tests/opt-debug-g1.exp index c17b7aa3c796..d6d014a0353f 100755 --- a/usr.bin/make/unit-tests/opt-debug-g1.exp +++ b/usr.bin/make/unit-tests/opt-debug-g1.exp @@ -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