Refs #7562
Remove unused test files and references #9376
pull btcdrak wants to merge 2 commits into bitcoin:master from btcdrak:fixmissing changing 2 files +1 −35-
btcdrak commented at 7:45 AM on December 19, 2016: contributor
-
Remove unused test files and references 23208ac81b
- fanquake added the label Tests on Dec 19, 2016
-
laanwj commented at 9:00 AM on December 19, 2016: member
This must have broken
make distdir. Unsure how did it pass the Travis tests.utACK https://github.com/bitcoin/bitcoin/pull/9376/commits/23208ac81b718508a4f5d0fbb20029941c96049d: verified that
test/data/blanktx.hexis indeed gone and should not be referenced, and thattest/data/txcreatesign.jsonis unreferenced and can go. -
fanquake commented at 10:36 AM on December 20, 2016: member
@laanwj Yes it looks like
make distdirhas been broken.$ make distdir if test -d "bitcoin-0.13.99"; then find "bitcoin-0.13.99" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "bitcoin-0.13.99" || { sleep 5 && rm -rf "bitcoin-0.13.99"; }; else :; fi test -d "bitcoin-0.13.99" || mkdir "bitcoin-0.13.99" (cd src && /Applications/Xcode.app/Contents/Developer/usr/bin/make top_distdir=../bitcoin-0.13.99 distdir=../bitcoin-0.13.99/src \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) Generated bench/data/block413567.raw.h Generated test/data/tx_valid.json.h make[1]: *** No rule to make target `test/data/blanktx.hex', needed by `distdir'. Stop. make: *** [distdir] Error 1However after merging this I still see:
config.status: executing depfiles commands make[1]: *** No rule to make target `test/data/txcreatesign.hex', needed by `distdir'. Stop. make: *** [distdir] Error 1@btcdrak Could you fixup that reference? Looks like it's now
txcreatesignv1.hex? -
MarcoFalke commented at 1:06 PM on December 20, 2016: member
@laanwj Travis never does the distdir step, I think.
On Tue, Dec 20, 2016 at 1:47 PM, Wladimir J. van der Laan < notifications@github.com> wrote:
@theuni https://github.com/theuni Shouldn't Travis pick up problems like this? It always did for me, although now that I think of it that was when forgetting to specify .h files.
— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/bitcoin/bitcoin/pull/9376#issuecomment-268235041, or mute the thread https://github.com/notifications/unsubscribe-auth/AGGmv62Fyb17XHp0q4b6toRWo4VrPGxSks5rJ855gaJpZM4LQc6h .
-
laanwj commented at 2:22 PM on December 20, 2016: member
Okay, then I must be confused with gitian. I thought it did that before building. But maybe that's only gitian.
-
ghost commented at 4:10 PM on December 20, 2016: none
I got this error
+ make dist make dist-gzip am__post_remove_distdir='@:' make[1]: Entering directory `/home/ubuntu/build/bitcoin' if test -d "bitcoin-0.13.99"; then find "bitcoin-0.13.99" -type d ! -perm -200 - exec chmod u+w {} ';' && rm -rf "bitcoin-0.13.99" || { sleep 5 && rm -rf "bitcoi n-0.13.99"; }; else :; fi test -d "bitcoin-0.13.99" || mkdir "bitcoin-0.13.99" (cd src && make top_distdir=../bitcoin-0.13.99 distdir=../bitcoin-0.13.99/src \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[2]: Entering directory `/home/ubuntu/build/bitcoin/src' Generated bench/data/block413567.raw.h Generated test/data/script_tests.json.h Generated test/data/base58_keys_valid.json.h Generated test/data/base58_encode_decode.json.h Generated test/data/base58_keys_invalid.json.h Generated test/data/tx_invalid.json.h Generated test/data/tx_valid.json.h Generated test/data/sighash.json.h make[2]: *** No rule to make target `test/data/blanktx.hex', needed by `distdir' . Stop. make[2]: Leaving directory `/home/ubuntu/build/bitcoin/src' make[1]: *** [distdir] Error 1 make[1]: Leaving directory `/home/ubuntu/build/bitcoin' make: *** [dist] Error 2 -
theuni commented at 6:07 PM on December 20, 2016: member
@laanwj IIRC we used to have a distcheck in Travis, but got rid of it a while ago because it was too heavy. Or maybe it was that it used distdir before the out-of-tree build?
I think we could probably add back the lighter
make distdirat the end to catch these things. -
Fix testfile reference 9cb66248dc
-
fanquake commented at 11:37 PM on December 20, 2016: member
@btcdrak Thanks, looks better now:
bash-3.2$ make distdir if test -d "bitcoin-0.13.99"; then find "bitcoin-0.13.99" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -rf "bitcoin-0.13.99" || { sleep 5 && rm -rf "bitcoin-0.13.99"; }; else :; fi test -d "bitcoin-0.13.99" || mkdir "bitcoin-0.13.99" (cd src && /Applications/Xcode.app/Contents/Developer/usr/bin/make top_distdir=../bitcoin-0.13.99 distdir=../bitcoin-0.13.99/src \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) (cd secp256k1 && /Applications/Xcode.app/Contents/Developer/usr/bin/make top_distdir=../../bitcoin-0.13.99 distdir=../../bitcoin-0.13.99/src/secp256k1 \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) : test -d "../../bitcoin-0.13.99/src/secp256k1" || mkdir "../../bitcoin-0.13.99/src/secp256k1" test -n ":" \ || find "../../bitcoin-0.13.99/src/secp256k1" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec /bin/sh /Users/michael/bitcoin/src/secp256k1/build-aux/install-sh -c -m a+r {} {} \; \ || chmod -R a+r "../../bitcoin-0.13.99/src/secp256k1" (cd univalue && /Applications/Xcode.app/Contents/Developer/usr/bin/make top_distdir=../../bitcoin-0.13.99 distdir=../../bitcoin-0.13.99/src/univalue \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) : test -d "../../bitcoin-0.13.99/src/univalue" || mkdir "../../bitcoin-0.13.99/src/univalue" test -n ":" \ || find "../../bitcoin-0.13.99/src/univalue" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec /bin/sh /Users/michael/bitcoin/src/univalue/build-aux/install-sh -c -m a+r {} {} \; \ || chmod -R a+r "../../bitcoin-0.13.99/src/univalue" (cd doc/man && /Applications/Xcode.app/Contents/Developer/usr/bin/make top_distdir=../../bitcoin-0.13.99 distdir=../../bitcoin-0.13.99/doc/man \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) /Applications/Xcode.app/Contents/Developer/usr/bin/make \ top_distdir="bitcoin-0.13.99" distdir="bitcoin-0.13.99" \ dist-hook /usr/local/bin/git archive --format=tar HEAD -- src/clientversion.cpp | ${TAR-tar} -C bitcoin-0.13.99 -xf - test -n "" \ || find "bitcoin-0.13.99" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec /bin/sh /Users/michael/bitcoin/build-aux/install-sh -c -m a+r {} {} \; \ || chmod -R a+r "bitcoin-0.13.99"ACK https://github.com/bitcoin/bitcoin/pull/9376/commits/9cb66248dc7e1c782256d1f69ad67f9c63fb61f8
-
laanwj commented at 8:03 AM on December 21, 2016: member
@laanwj IIRC we used to have a distcheck in Travis, but got rid of it a while ago because it was too heavy. Or maybe it was that it used distdir before the out-of-tree build?
The travis check was the only way most people were even noticing inconsistencies in the Makefile with regard to installed files, this is why pulls like this are popping up all over the place now.
It would be fine even if only one Travis builder built from distdir.
- laanwj merged this on Dec 21, 2016
- laanwj closed this on Dec 21, 2016
- laanwj referenced this in commit 8dfe9fcb90 on Dec 21, 2016
-
droark commented at 6:51 PM on December 21, 2016: contributor
Posthumous ACK
blanktx.json is still sitting around unused. I believe it can be used for a v1 JSON test that doesn't seem to exist right now. I'll file a PR where I change it to blanktxv1.json and integrate it into the test suite.
- btcdrak deleted the branch on Dec 21, 2016
- codablock referenced this in commit b72f9249d9 on Jan 20, 2018
- andvgal referenced this in commit fb97344113 on Jan 6, 2019
- CryptoCentric referenced this in commit 4440487393 on Feb 27, 2019
- CryptoCentric referenced this in commit de6eeec6e5 on Mar 5, 2019
- MarcoFalke locked this on Sep 8, 2021