Skip to content

Conversation

@btcdrak
Copy link
Contributor

@btcdrak btcdrak commented Dec 19, 2016

Refs #7562

@laanwj
Copy link
Member

laanwj commented Dec 19, 2016

This must have broken make distdir. Unsure how did it pass the Travis tests.

utACK 23208ac: verified that test/data/blanktx.hex is indeed gone and should not be referenced, and that test/data/txcreatesign.json is unreferenced and can go.

@fanquake
Copy link
Member

@laanwj Yes it looks like make distdir has 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 1

However 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?

@laanwj
Copy link
Member

laanwj commented Dec 20, 2016

@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.

@maflcko
Copy link
Member

maflcko commented Dec 20, 2016 via email

@laanwj
Copy link
Member

laanwj commented Dec 20, 2016

Okay, then I must be confused with gitian. I thought it did that before building. But maybe that's only gitian.

@ghost
Copy link

ghost commented Dec 20, 2016

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
Copy link
Member

theuni commented Dec 20, 2016

@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 distdir at the end to catch these things.

@btcdrak
Copy link
Contributor Author

btcdrak commented Dec 20, 2016

Could you fixup that reference? Looks like it's now txcreatesignv1.hex?

@fanquake done.

@fanquake fanquake mentioned this pull request Dec 20, 2016
@fanquake
Copy link
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 9cb6624

@laanwj
Copy link
Member

laanwj commented Dec 21, 2016

@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 laanwj merged commit 9cb6624 into bitcoin:master Dec 21, 2016
laanwj added a commit that referenced this pull request Dec 21, 2016
9cb6624 Fix testfile reference (BtcDrak)
23208ac Remove unused test files and references (BtcDrak)
@laanwj laanwj mentioned this pull request Dec 21, 2016
@droark
Copy link
Contributor

droark commented Dec 21, 2016

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 btcdrak deleted the fixmissing branch December 21, 2016 21:22
codablock pushed a commit to codablock/dash that referenced this pull request Jan 20, 2018
9cb6624 Fix testfile reference (BtcDrak)
23208ac Remove unused test files and references (BtcDrak)
andvgal pushed a commit to energicryptocurrency/gen2-energi that referenced this pull request Jan 6, 2019
9cb6624 Fix testfile reference (BtcDrak)
23208ac Remove unused test files and references (BtcDrak)
CryptoCentric pushed a commit to absolute-community/absolute that referenced this pull request Feb 27, 2019
9cb6624 Fix testfile reference (BtcDrak)
23208ac Remove unused test files and references (BtcDrak)
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants