Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build: during 'make clean', remove some files that are currently missed. #14253

Merged
merged 1 commit into from Oct 8, 2018

Conversation

Projects
None yet
5 participants
@murrayn
Copy link
Contributor

commented Sep 18, 2018

make clean currently leaves behind some cache and test log files that should be removed.

@fanquake fanquake requested a review from theuni Sep 18, 2018

src/Makefile.am Outdated
@@ -547,6 +547,7 @@ CLEANFILES += wallet/*.gcda wallet/*.gcno
CLEANFILES += wallet/test/*.gcda wallet/test/*.gcno
CLEANFILES += zmq/*.gcda zmq/*.gcno
CLEANFILES += obj/build.h
CLEANFILES += test/*.cpp.log wallet/test/*.cpp.log

This comment has been minimized.

Copy link
@theuni

theuni Sep 26, 2018

Member

To avoid adding another nasty wildcard, I think this one can be $(BITCOIN_TESTS:.cpp=.cpp.log) .

Also, please append it to CLEAN_BITCOIN_TEST in Makefile.test.include instead, to keep the test stuff in one place.

@theuni

This comment has been minimized.

Copy link
Member

commented Sep 26, 2018

utACK other than the requested change.

@murrayn

This comment has been minimized.

Copy link
Contributor Author

commented Sep 27, 2018

@theuni thanks for the feedback. I've made the change you suggested.

@DrahtBot

This comment has been minimized.

Copy link
Contributor

commented Sep 27, 2018

No more conflicts as of last run.
@theuni

This comment has been minimized.

Copy link
Member

commented Sep 27, 2018

utACK the changes, thank you.

Please squash them down to a single commit though.

@DrahtBot

This comment has been minimized.

Copy link
Contributor

commented Sep 28, 2018

Coverage Change (pull 14253) Reference (master)
Lines +0.0132 % 87.0361 %
Functions +0.0772 % 84.1130 %
Branches +0.0161 % 51.5451 %

@murrayn murrayn force-pushed the murrayn:makedistclean branch to 3f5ac27 Oct 1, 2018

@fanquake

This comment has been minimized.

Copy link
Member

commented Oct 8, 2018

tACK 3f5ac27

@theuni

This comment has been minimized.

Copy link
Member

commented Oct 8, 2018

utACK 3f5ac27

MarcoFalke added a commit to MarcoFalke/bitcoin that referenced this pull request Oct 8, 2018

Merge bitcoin#14253: Build: during 'make clean', remove some files th…
…at are currently missed.

3f5ac27 Include some files currently missed by 'make distclean'. (murrayn)

Pull request description:

  `make clean` currently leaves behind some cache and test log files that should be removed.

Tree-SHA512: a1877e776e24232f6dd1468d7f392ea0bd1e93fdd975e623897d48c4b23a080a2e84ebb199f5482abd6b8c9ddd036850325e7b7ed07e2f9fe7a32f83cc99da4a

@MarcoFalke MarcoFalke merged commit 3f5ac27 into bitcoin:master Oct 8, 2018

1 check passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
@@ -294,5 +294,5 @@ clean-docs:

clean-local: clean-docs
rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP)
rm -rf test/functional/__pycache__ test/functional/test_framework/__pycache__ test/cache
rm -rf test/functional/__pycache__ test/functional/test_framework/__pycache__ test/cache share/rpcauth/__pycache__

This comment has been minimized.

Copy link
@MarcoFalke

MarcoFalke Oct 9, 2018

Member

This also deletes src/test/scriptnum10.h

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.