diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f729a62dc..87dd21075b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -275,6 +275,7 @@ jobs: if: matrix.job-type == 'standard' working-directory: build env: + BITCOIN_BIN: '${{ github.workspace }}\build\bin\Release\bitcoin.exe' BITCOIND: '${{ github.workspace }}\build\bin\Release\bitcoind.exe' BITCOINCLI: '${{ github.workspace }}\build\bin\Release\bitcoin-cli.exe' BITCOINTX: '${{ github.workspace }}\build\bin\Release\bitcoin-tx.exe' diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py index abe62bc2be..bc722ab7e8 100755 --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -278,6 +278,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass): paths = types.SimpleNamespace() binaries = { + "bitcoin": "BITCOIN_BIN", "bitcoind": "BITCOIND", "bitcoin-cli": "BITCOINCLI", "bitcoin-util": "BITCOINUTIL", @@ -285,6 +286,8 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass): "bitcoin-chainstate": "BITCOINCHAINSTATE", "bitcoin-wallet": "BITCOINWALLET", } + # Set paths to bitcoin core binaries allowing overrides with environment + # variables. for binary, env_variable_name in binaries.items(): default_filename = os.path.join( self.config["environment"]["BUILDDIR"],