Module Name: othersrc
Committed By: agc
Date: Tue Feb 15 19:29:07 UTC 2022
Modified Files:
othersrc/external/bsd/merkletree/bin: Makefile
othersrc/external/bsd/merkletree/dist/tests: 15.expected 16.expected
Added Files:
othersrc/external/bsd/merkletree/bin: mktestdir.sh
Removed Files:
othersrc/external/bsd/merkletree/bin: 1.expected 1.in 1.sum 10.expected
11.expected 12.expected 13.expected 14.expected 15.expected
2.expected 2.in 3.expected 4.expected 5.expected 6.expected
7.expected 8.expected 9.expected
othersrc/external/bsd/merkletree/dist/tests/dir: 1.expected 1.in
1.symlink 7.expected
Log Message:
clean up old test files
do the path and directory test in a different way (cvs has issues with
symlinks, yay - create the test directory on the fly each time
remove the hardcoded test directory
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 othersrc/external/bsd/merkletree/bin/1.expected \
othersrc/external/bsd/merkletree/bin/1.sum \
othersrc/external/bsd/merkletree/bin/10.expected \
othersrc/external/bsd/merkletree/bin/11.expected \
othersrc/external/bsd/merkletree/bin/12.expected \
othersrc/external/bsd/merkletree/bin/13.expected \
othersrc/external/bsd/merkletree/bin/14.expected \
othersrc/external/bsd/merkletree/bin/15.expected \
othersrc/external/bsd/merkletree/bin/2.expected \
othersrc/external/bsd/merkletree/bin/2.in \
othersrc/external/bsd/merkletree/bin/3.expected \
othersrc/external/bsd/merkletree/bin/4.expected \
othersrc/external/bsd/merkletree/bin/5.expected \
othersrc/external/bsd/merkletree/bin/6.expected \
othersrc/external/bsd/merkletree/bin/7.expected \
othersrc/external/bsd/merkletree/bin/8.expected \
othersrc/external/bsd/merkletree/bin/9.expected
cvs rdiff -u -r1.2 -r0 othersrc/external/bsd/merkletree/bin/1.in
cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/merkletree/bin/Makefile
cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/merkletree/bin/mktestdir.sh
cvs rdiff -u -r1.1 -r1.2 \
othersrc/external/bsd/merkletree/dist/tests/15.expected \
othersrc/external/bsd/merkletree/dist/tests/16.expected
cvs rdiff -u -r1.1 -r0 \
othersrc/external/bsd/merkletree/dist/tests/dir/1.expected \
othersrc/external/bsd/merkletree/dist/tests/dir/1.in \
othersrc/external/bsd/merkletree/dist/tests/dir/1.symlink \
othersrc/external/bsd/merkletree/dist/tests/dir/7.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.2 othersrc/external/bsd/merkletree/bin/Makefile:1.3
--- othersrc/external/bsd/merkletree/bin/Makefile:1.2 Tue Feb 15 18:48:32 2022
+++ othersrc/external/bsd/merkletree/bin/Makefile Tue Feb 15 19:29:07 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/02/15 18:48:32 agc Exp $
+# $NetBSD: Makefile,v 1.3 2022/02/15 19:29:07 agc Exp $
.include <bsd.own.mk>
@@ -95,12 +95,16 @@ t: ${PROG}
diff ${TESTDIR}/14.expected 14.out
rm -f 14.out
@echo "15. json, path directory and symlinks"
- env LD_LIBRARY_PATH=${LIB_MERKLETREE_DIR} ./${PROG} -j -p ${TESTDIR}/dir . > 15.out
- diff ${TESTDIR}/15.expected 15.out
+ d=$$(./mktestdir.sh ${TESTDIR}); \
+ env LD_LIBRARY_PATH=${LIB_MERKLETREE_DIR} ./${PROG} -j -p $$d . > 15.out; \
+ diff ${TESTDIR}/15.expected 15.out || exit 1; \
+ rm -rf $$d
rm -f 15.out
@echo "16. -p path"
- env LD_LIBRARY_PATH=${LIB_MERKLETREE_DIR} ./${PROG} -l -p ${TESTDIR}/dir . > 16.out
- diff ${TESTDIR}/16.expected 16.out
+ d=$$(./mktestdir.sh ${TESTDIR}); \
+ env LD_LIBRARY_PATH=${LIB_MERKLETREE_DIR} ./${PROG} -l -p ${TESTDIR}/dir . > 16.out; \
+ diff ${TESTDIR}/16.expected 16.out || exit 1; \
+ rm -rf $$d
rm -f 16.out
@echo "17. non-existent file"
-env LD_LIBRARY_PATH=${LIB_MERKLETREE_DIR} ./${PROG} skdjvsjfsvdfjbnldkbmdgkb
Index: othersrc/external/bsd/merkletree/dist/tests/15.expected
diff -u othersrc/external/bsd/merkletree/dist/tests/15.expected:1.1 othersrc/external/bsd/merkletree/dist/tests/15.expected:1.2
--- othersrc/external/bsd/merkletree/dist/tests/15.expected:1.1 Tue Feb 15 18:48:32 2022
+++ othersrc/external/bsd/merkletree/dist/tests/15.expected Tue Feb 15 19:29:07 2022
@@ -1,4 +1,4 @@
{"name":"./1.in","blocksize":1024,"digest":"sha512","1:0":"902387724175187f42a6bce7ab7f1a88a4ce536662880747347dc5ea761fed5a7dac5e98962c60b5c3d7988258c0c9e2a14e37cfeb7972fe9086e693381324c8"}
-{"name":"./7.expected","blocksize":1024,"digest":"sha512","0:0":"e4f51d07a871d2a74660fe327cfd6ff8183bebb011dbe442d8115e45a744af09ee9907427f968cc9c0db5a9fc8b03f57e942a8964c8e75701cd3b66db60ead3f"}
+{"name":"./1.expected","blocksize":1024,"digest":"sha512","0:0":"f4fd1ca9cb7d3833fd3824f103cae3e9901eeace852f30a76199f052ec9e5d1d32969b734adc3cb2f248cfeffe66a6e6db671b053eeb146c69fc3337edf505f1"}
+{"name":"./7.expected","blocksize":1024,"digest":"sha512","0:0":"a1d931bfa74a61e669fec43531c1d62d4c3aa5e4172f35dc494a4728ccbea9dd49ad47b476da282aad1d4435f012cfc97207f42de1bf77c3a3119e35bbe5e1e3"}
{"name":"./1.symlink","blocksize":1024,"digest":"sha512","0:0":"c92811be76681fe89507f4cd767b16d80f61a9afc27d3d71608b617eba73d4e85cfcd3bf33e9cfcfa44c1f907ab4aaa54748b469fd63bce5d87e14a5af4840ff"}
-{"name":"./1.expected","blocksize":1024,"digest":"sha512","0:0":"ee8f661499e829d6ddf1fbcfbe61e34a50b44c810d653aece84e7414906ec611a7b41a8538bb25c8ea661aba205d150bf225654c8eac382ecae8ecdd146fed45"}
Index: othersrc/external/bsd/merkletree/dist/tests/16.expected
diff -u othersrc/external/bsd/merkletree/dist/tests/16.expected:1.1 othersrc/external/bsd/merkletree/dist/tests/16.expected:1.2
--- othersrc/external/bsd/merkletree/dist/tests/16.expected:1.1 Tue Feb 15 18:48:32 2022
+++ othersrc/external/bsd/merkletree/dist/tests/16.expected Tue Feb 15 19:29:07 2022
@@ -1,12 +1,8 @@
-sha512/1024 (./1.in)
-[0:0] e481d5d54aa2e1372bcc0f2f61250a5f3f9da4897dbea76033d4b86fcf227253c35d0951ccfa99e05a9d45d6a3f796e13e97f471a0956c5ef2f372a536f13543
-[0:1024] 1b51d590e649ba166b69713000dc476e7625fc19940f978aa5b3a3ddd560ae19059ea47ef531da833b21911a96229bb879c2f415ab1125492f736f4c289143e0
-[0:2048] e4ec3182f61352cf6eff2345f9e81e3cc8a98f2f36aead5ebd632c193606ba188e31b7e7eb150c679c97ca95745b40eef3817e5fb7e2a1066cc1df3fe4364256
-[0:3072] 99b961e0a45b52a99cd4a6876cd6fe54738131ff4662c04a33a318b6ffd2040c8fa9dc2ea7c9d52c2d0c9ee6d106219f9f4d986ac100e939bb7c4b7961acdf01
-[1:0] 902387724175187f42a6bce7ab7f1a88a4ce536662880747347dc5ea761fed5a7dac5e98962c60b5c3d7988258c0c9e2a14e37cfeb7972fe9086e693381324c8
-sha512/1024 (./7.expected)
-[0:0] e4f51d07a871d2a74660fe327cfd6ff8183bebb011dbe442d8115e45a744af09ee9907427f968cc9c0db5a9fc8b03f57e942a8964c8e75701cd3b66db60ead3f
-sha512/1024 (./1.symlink)
-[0:0] c92811be76681fe89507f4cd767b16d80f61a9afc27d3d71608b617eba73d4e85cfcd3bf33e9cfcfa44c1f907ab4aaa54748b469fd63bce5d87e14a5af4840ff
-sha512/1024 (./1.expected)
-[0:0] ee8f661499e829d6ddf1fbcfbe61e34a50b44c810d653aece84e7414906ec611a7b41a8538bb25c8ea661aba205d150bf225654c8eac382ecae8ecdd146fed45
+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
Added files:
Index: othersrc/external/bsd/merkletree/bin/mktestdir.sh
diff -u /dev/null othersrc/external/bsd/merkletree/bin/mktestdir.sh:1.1
--- /dev/null Tue Feb 15 19:29:07 2022
+++ othersrc/external/bsd/merkletree/bin/mktestdir.sh Tue Feb 15 19:29:07 2022
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+d=$(mktemp -d /tmp/merkletree.XXXXXX)
+echo $d
+cp $1/1.in $d
+cp $1/1.expected $d
+cp $1/7.expected $d
+(cd $d && ln -s 1.in 1.symlink)
