Module Name: src
Committed By: sjg
Date: Thu Jan 27 21:50:50 UTC 2022
Modified Files:
src/usr.bin/make/unit-tests: Makefile opt-debug-hash.exp
Log Message:
numEntries can vary
To generate a diff of this commit:
cvs rdiff -u -r1.301 -r1.302 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/opt-debug-hash.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.301 src/usr.bin/make/unit-tests/Makefile:1.302
--- src/usr.bin/make/unit-tests/Makefile:1.301 Thu Jan 27 02:24:46 2022
+++ src/usr.bin/make/unit-tests/Makefile Thu Jan 27 21:50:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.301 2022/01/27 02:24:46 sjg Exp $
+# $NetBSD: Makefile,v 1.302 2022/01/27 21:50:50 sjg Exp $
#
# Unit tests for make(1)
#
@@ -503,6 +503,7 @@ SED_CMDS.opt-chdir= -e 's,\(nonexistent
SED_CMDS.opt-debug-graph1= ${STD_SED_CMDS.dg1}
SED_CMDS.opt-debug-graph2= ${STD_SED_CMDS.dg2}
SED_CMDS.opt-debug-graph3= ${STD_SED_CMDS.dg3}
+SED_CMDS.opt-debug-hash= -e 's,\(numEntries\)=[1-9][0-9],\1=<entries>,'
SED_CMDS.opt-debug-jobs= -e 's,([0-9][0-9]*),(<pid>),'
SED_CMDS.opt-debug-jobs+= -e 's,pid [0-9][0-9]*,pid <pid>,'
SED_CMDS.opt-debug-jobs+= -e 's,Process [0-9][0-9]*,Process <pid>,'
Index: src/usr.bin/make/unit-tests/opt-debug-hash.exp
diff -u src/usr.bin/make/unit-tests/opt-debug-hash.exp:1.3 src/usr.bin/make/unit-tests/opt-debug-hash.exp:1.4
--- src/usr.bin/make/unit-tests/opt-debug-hash.exp:1.3 Sat Jan 22 18:59:24 2022
+++ src/usr.bin/make/unit-tests/opt-debug-hash.exp Thu Jan 27 21:50:50 2022
@@ -1,6 +1,6 @@
make: "opt-debug-hash.mk" line 11: Missing argument for ".error"
make: Fatal errors encountered -- cannot continue
HashTable targets: size=16 numEntries=0 maxchain=0
-HashTable Global variables: size=16 numEntries=23 maxchain=3
+HashTable Global variables: size=16 numEntries=<entries> maxchain=3
make: stopped in unit-tests
exit status 1
