Page MenuHomePhabricator
Differential D5749

Backport Core PR12246
ClosedPublic
Actions

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

Details

Reviewers
Fabien
Group Reviewers
Restricted Project
Commits
rSTAGINGa7ca467d91a4: Backport Core PR12246
rABCa7ca467d91a4: Backport Core PR12246
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

deadalnix created this revision.Apr 16 2020, 23:15
Herald added a reviewer: Restricted Project. · View Herald TranscriptApr 16 2020, 23:15
teamcity edited the summary of this revision. (Show Details)Apr 16 2020, 23:15

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

teamcity added a comment.Apr 16 2020, 23:15

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) started.

teamcity added a comment.Apr 16 2020, 23:27

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) passed.

Harbormaster completed remote builds in B10257: Diff 18877.Apr 16 2020, 23:27
deadalnix added a child revision: D5751: [tools] Add wallet inspection and modification tool.Apr 17 2020, 01:15
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
deadalnix updated this revision to Diff 18895.Apr 17 2020, 12:50

Fix build problems

teamcity added a comment.Apr 17 2020, 12:50

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) started.

teamcity added a comment.Apr 17 2020, 13:03

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) passed.

Harbormaster completed remote builds in B10270: Diff 18895.Apr 17 2020, 13:03
Fabien accepted this revision.Apr 17 2020, 13:14
This revision is now accepted and ready to land.Apr 17 2020, 13:14
Closed by commit rABCa7ca467d91a4: Backport Core PR12246 (authored by Luke Dashjr <luke-jr+git@utopios.org>, committed by deadalnix). · Explain WhyApr 17 2020, 13:24
This revision was automatically updated to reflect the committed changes.
deadalnix added a commit: rABCa7ca467d91a4: Backport Core PR12246.
deadalnix added a commit: rSTAGINGa7ca467d91a4: Backport Core PR12246.May 5 2020, 19:00

Revision Contents
Changeset List

PathSize
32 lines
doc/
man/
8 lines
src/
7 lines
2 lines
test/
4 lines
2 lines
functional/
test_framework/
2 lines

Diff 18898

View Options

configure.ac

Loading...
View Options

doc/man/Makefile.am

Loading...
View Options

src/Makefile.am

Loading...
View Options

src/Makefile.test.include

Loading...
View Options

test/CMakeLists.txt

Loading...
View Options

test/config.ini.in

Loading...
View Options

test/functional/test_framework/test_framework.py

Loading...