Page MenuHomePhabricator

Backport Core PR12246
ClosedPublic

Authored by deadalnix on Apr 16 2020, 23:15.

Details

Summary
  • configure: Make it possible to build only one of bitcoin-cli or bitcoin-tx
  • Bugfix: Only run bitcoin-tx tests when bitcoin-tx is enabled

This is a backport of Core PR12246

Test Plan

Build with autotool and ninja

Ran ninja check-all to make sure that the change in autotool didn't mess up the ninja integration test suite.

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

[Bot Message]
One or more PR numbers were detected in the summary.
Links to those PRs have been inserted into the summary for reference.

Fabien requested changes to this revision.Apr 17 2020, 08:41
Fabien added a subscriber: Fabien.
Fabien added inline comments.
configure.ac
917 ↗(On Diff #18877)

Spurious wheel click ?

test/config.ini.in
17 ↗(On Diff #18877)

This is broken. In fact it made me discover that is was already broken due to a typo.
If you disable bitcoin-cli (-DBUILD_BITCOIN_CLI=OFF) this will be true and the tests would fail, because BUILD_BITCOIN_CLI_TRUE is never set.
It was already the case before because the test is wrong:
Form test/CMakeLists.txt:

if(NOT BUILD_BITCOIN_TX OR NOT BUILD_BITCOIN_TX)
	set(BUILD_BITCOIN_UTILS_TRUE "#")
endif()

This should be (with the changes from this diff):

if(NOT BUILD_BITCOIN_CLI)
	set(BUILD_BITCOIN_CLI_TRUE "#")
endif()

Can you fix this block for now ? I will refactor the whole file after this is landed to have a proper cmake style template.

This revision now requires changes to proceed.Apr 17 2020, 08:41
This revision is now accepted and ready to land.Apr 17 2020, 13:14
This revision was automatically updated to reflect the committed changes.