Module Name: othersrc
Committed By: agc
Date: Tue Feb 15 19:32:32 UTC 2022
Modified Files:
othersrc/external/bsd/merkletree/bin: Makefile
othersrc/external/bsd/merkletree/dist/tests: 16.expected
Log Message:
... and point merkletree at the correct test directory
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 othersrc/external/bsd/merkletree/bin/Makefile
cvs rdiff -u -r1.2 -r1.3 \
othersrc/external/bsd/merkletree/dist/tests/16.expected
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/merkletree/bin/Makefile
diff -u othersrc/external/bsd/merkletree/bin/Makefile:1.3 othersrc/external/bsd/merkletree/bin/Makefile:1.4
--- othersrc/external/bsd/merkletree/bin/Makefile:1.3 Tue Feb 15 19:29:07 2022
+++ othersrc/external/bsd/merkletree/bin/Makefile Tue Feb 15 19:32:32 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/02/15 19:29:07 agc Exp $
+# $NetBSD: Makefile,v 1.4 2022/02/15 19:32:32 agc Exp $
.include <bsd.own.mk>
@@ -102,7 +102,7 @@ t: ${PROG}
rm -f 15.out
@echo "16. -p path"
d=$$(./mktestdir.sh ${TESTDIR}); \
- env LD_LIBRARY_PATH=${LIB_MERKLETREE_DIR} ./${PROG} -l -p ${TESTDIR}/dir . > 16.out; \
+ env LD_LIBRARY_PATH=${LIB_MERKLETREE_DIR} ./${PROG} -l -p $$d . > 16.out; \
diff ${TESTDIR}/16.expected 16.out || exit 1; \
rm -rf $$d
rm -f 16.out
Index: othersrc/external/bsd/merkletree/dist/tests/16.expected
diff -u othersrc/external/bsd/merkletree/dist/tests/16.expected:1.2 othersrc/external/bsd/merkletree/dist/tests/16.expected:1.3
--- othersrc/external/bsd/merkletree/dist/tests/16.expected:1.2 Tue Feb 15 19:29:07 2022
+++ othersrc/external/bsd/merkletree/dist/tests/16.expected Tue Feb 15 19:32:32 2022
@@ -1,8 +1,12 @@
-sha512/1024 (./CVS/Template)
-[0:0] 40809df6cf9c38ab2d5e7202f14ab4b9e76084f29741be8c4c93b2c439a606a821d591a622f2cb259ef38333eb8da177db6343d81d47ccc026cff245e1835d5c
-sha512/1024 (./CVS/Repository)
-[0:0] d3fb8cbff5170a47fe0e1aad14d24e0e1ae69640fe579411d8be476809f7ec9ceb5ed18bf9529e8af6f50211363719bcc47cdf7d0d82735155166ba54e0eb77f
-sha512/1024 (./CVS/Entries)
-[0:0] 0341365c2dc7fc5fa09fa295e3c819b39f5adefbdbfbbd8af91d515de3bfe272eef7a2c32b55c96ca4768a22eeca06786c51314b44946435eeef6e79cf941602
-sha512/1024 (./CVS/Root)
-[0:0] 25bb805fa05ceb08a96fef703303dbaa164fb1f46cd3e1324b1c6e9fb7b7913ce0e5de38aec31520dfa0ef3a0a20fb1a67ffff12d725ff18e4279d35c3cf51a4
+sha512/1024 (./1.in)
+[0:0] e481d5d54aa2e1372bcc0f2f61250a5f3f9da4897dbea76033d4b86fcf227253c35d0951ccfa99e05a9d45d6a3f796e13e97f471a0956c5ef2f372a536f13543
+[0:1024] 1b51d590e649ba166b69713000dc476e7625fc19940f978aa5b3a3ddd560ae19059ea47ef531da833b21911a96229bb879c2f415ab1125492f736f4c289143e0
+[0:2048] e4ec3182f61352cf6eff2345f9e81e3cc8a98f2f36aead5ebd632c193606ba188e31b7e7eb150c679c97ca95745b40eef3817e5fb7e2a1066cc1df3fe4364256
+[0:3072] 99b961e0a45b52a99cd4a6876cd6fe54738131ff4662c04a33a318b6ffd2040c8fa9dc2ea7c9d52c2d0c9ee6d106219f9f4d986ac100e939bb7c4b7961acdf01
+[1:0] 902387724175187f42a6bce7ab7f1a88a4ce536662880747347dc5ea761fed5a7dac5e98962c60b5c3d7988258c0c9e2a14e37cfeb7972fe9086e693381324c8
+sha512/1024 (./1.expected)
+[0:0] f4fd1ca9cb7d3833fd3824f103cae3e9901eeace852f30a76199f052ec9e5d1d32969b734adc3cb2f248cfeffe66a6e6db671b053eeb146c69fc3337edf505f1
+sha512/1024 (./7.expected)
+[0:0] a1d931bfa74a61e669fec43531c1d62d4c3aa5e4172f35dc494a4728ccbea9dd49ad47b476da282aad1d4435f012cfc97207f42de1bf77c3a3119e35bbe5e1e3
+sha512/1024 (./1.symlink)
+[0:0] c92811be76681fe89507f4cd767b16d80f61a9afc27d3d71608b617eba73d4e85cfcd3bf33e9cfcfa44c1f907ab4aaa54748b469fd63bce5d87e14a5af4840ff
