highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-15 16:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

test: Provide path to bitcoin binary

Browse Source 
Set new `BitcoinTestFramework.binary_paths.bitcoin_bin` property with path to
the `bitcoin` wrapper binary. This allows new tests for `bitcoin-mine` in
#30437 and `bitcoin-cli` in #32297 to find the `bitcoin` binary and call
`bitcoin -m` to start nodes with IPC support. This way the new tests can run
whenever the ENABLE_IPC build option is enabled, instead of only running when
the `BITCOIN_CMD` environment variable is set to `bitcoin -m`
This commit is contained in:
Ryan Ofsky
2024-11-26 22:53:46 -05:00
committed by Pieter Wuille
parent 8c7f005629
commit 3cceb60a71
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/ci.yml vendored
View File

@@ -275,6 +275,7 @@ jobs:
if: matrix.job-type == 'standard' if: matrix.job-type == 'standard'
working-directory: build working-directory: build
env: env:
BITCOIN_BIN: '${{ github.workspace }}\build\bin\Release\bitcoin.exe'
BITCOIND: '${{ github.workspace }}\build\bin\Release\bitcoind.exe' BITCOIND: '${{ github.workspace }}\build\bin\Release\bitcoind.exe'
BITCOINCLI: '${{ github.workspace }}\build\bin\Release\bitcoin-cli.exe' BITCOINCLI: '${{ github.workspace }}\build\bin\Release\bitcoin-cli.exe'
BITCOINTX: '${{ github.workspace }}\build\bin\Release\bitcoin-tx.exe' BITCOINTX: '${{ github.workspace }}\build\bin\Release\bitcoin-tx.exe'

3
test/functional/test_framework/test_framework.py
View File

@@ -278,6 +278,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
paths = types.SimpleNamespace() paths = types.SimpleNamespace()
binaries = { binaries = {
"bitcoin": "BITCOIN_BIN",
"bitcoind": "BITCOIND", "bitcoind": "BITCOIND",
"bitcoin-cli": "BITCOINCLI", "bitcoin-cli": "BITCOINCLI",
"bitcoin-util": "BITCOINUTIL", "bitcoin-util": "BITCOINUTIL",
@@ -285,6 +286,8 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
"bitcoin-chainstate": "BITCOINCHAINSTATE", "bitcoin-chainstate": "BITCOINCHAINSTATE",
"bitcoin-wallet": "BITCOINWALLET", "bitcoin-wallet": "BITCOINWALLET",
} }
# Set paths to bitcoin core binaries allowing overrides with environment
# variables.
for binary, env_variable_name in binaries.items(): for binary, env_variable_name in binaries.items():
default_filename = os.path.join( default_filename = os.path.join(
self.config["environment"]["BUILDDIR"], self.config["environment"]["BUILDDIR"],