diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-09-27 11:12:28 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-09-27 11:13:51 -0400 |
| commit | b88dd7c2dbf8daca58306afd1744c4f88049b6df (patch) | |
| tree | 8c3149f03580ee8561e48da24b7e355464890297 /src/Makefile.test.include | |
| parent | edcf29c9da02c26ce8cae9bf2a68628c7543351e (diff) | |
| parent | a2a04a5abb347d52b3ef473f7c80c3c0ffc67a2f (diff) | |
| download | bitcoin-b88dd7c2dbf8daca58306afd1744c4f88049b6df.tar.xz | |
Merge #12246: Bugfix: Only run bitcoin-tx tests when bitcoin-tx is enabled
a2a04a5abb Bugfix: Only run bitcoin-tx tests when bitcoin-tx is enabled (Luke Dashjr)
92af71cea9 configure: Make it possible to build only one of bitcoin-cli or bitcoin-tx (Luke Dashjr)
Pull request description:
Includes #5618 (which the reasons for rejecting no longer hold true)
Tree-SHA512: f30a8e4a2f70166b7cabef77c4674163b3a9da14c6a547d34f00d1056a19bf4d23e22851eea726fad2afc8735d5473ae91122c770b65ac3886663dc20e2c5b70
Diffstat (limited to 'src/Makefile.test.include')
| -rw-r--r-- | src/Makefile.test.include | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 269a6ff805..8a537ed4f6 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -174,8 +174,10 @@ bitcoin_test_clean : FORCE rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY) check-local: $(BITCOIN_TESTS:.cpp=.cpp.test) +if BUILD_BITCOIN_TX @echo "Running test/util/bitcoin-util-test.py..." $(PYTHON) $(top_builddir)/test/util/bitcoin-util-test.py +endif @echo "Running test/util/rpcauth-test.py..." $(PYTHON) $(top_builddir)/test/util/rpcauth-test.py $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check |