diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 69c119d7371..63d18a93494 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -260,6 +260,7 @@ jobs: env: 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' BITCOINUTIL: '${{ github.workspace }}\build\bin\Release\bitcoin-util.exe' BITCOINWALLET: '${{ github.workspace }}\build\bin\Release\bitcoin-wallet.exe' TEST_RUNNER_EXTRA: ${{ github.event_name != 'pull_request' && '--extended' || '' }} diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py index 4b15a7c3202..5867398e1f7 100755 --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -84,6 +84,10 @@ class Binaries: # Add -nonamed because "bitcoin rpc" enables -named by default, but bitcoin-cli doesn't return self._argv("rpc", self.paths.bitcoincli) + ["-nonamed"] + def tx_argv(self): + "Return argv array that should be used to invoke bitcoin-tx" + return self._argv("tx", self.paths.bitcointx) + def util_argv(self): "Return argv array that should be used to invoke bitcoin-util" return self._argv("util", self.paths.bitcoinutil) @@ -288,6 +292,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass): "bitcoind": "BITCOIND", "bitcoin-cli": "BITCOINCLI", "bitcoin-util": "BITCOINUTIL", + "bitcoin-tx": "BITCOINTX", "bitcoin-chainstate": "BITCOINCHAINSTATE", "bitcoin-wallet": "BITCOINWALLET", }