diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-12-09 09:22:15 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-12-09 09:25:10 +0100 |
commit | fbc7a96d03200e55021c9e04f7fa9114272e6960 (patch) | |
tree | fd313e48fab02e44a5e1aed20f086bb8caf09b3f /src/test/Makefile.am | |
parent | acfa03337e8224ef778d4a5b2177271611f74593 (diff) | |
download | bitcoin-fbc7a96d03200e55021c9e04f7fa9114272e6960.tar.xz |
Re-enable miner tests in --disable-wallet mode
Use a fixed script instead of a CReserveKey from the wallet.
This does not affect the functionality or result of the tests as they never
check the state of the wallet in the first place.
Diffstat (limited to 'src/test/Makefile.am')
-rw-r--r-- | src/test/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/Makefile.am b/src/test/Makefile.am index dccd264e5a..ccc8da1690 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -31,14 +31,14 @@ test_bitcoin_SOURCES = alert_tests.cpp \ allocator_tests.cpp base32_tests.cpp base58_tests.cpp base64_tests.cpp \ bignum_tests.cpp bloom_tests.cpp canonical_tests.cpp checkblock_tests.cpp \ Checkpoints_tests.cpp compress_tests.cpp DoS_tests.cpp getarg_tests.cpp \ - key_tests.cpp mruset_tests.cpp multisig_tests.cpp \ + key_tests.cpp miner_tests.cpp mruset_tests.cpp multisig_tests.cpp \ netbase_tests.cpp pmt_tests.cpp rpc_tests.cpp script_P2SH_tests.cpp \ script_tests.cpp serialize_tests.cpp sigopcount_tests.cpp test_bitcoin.cpp \ transaction_tests.cpp uint160_tests.cpp uint256_tests.cpp util_tests.cpp \ sighash_tests.cpp $(JSON_TEST_FILES) $(RAW_TEST_FILES) if ENABLE_WALLET -test_bitcoin_SOURCES += accounting_tests.cpp wallet_tests.cpp miner_tests.cpp rpc_wallet_tests.cpp +test_bitcoin_SOURCES += accounting_tests.cpp wallet_tests.cpp rpc_wallet_tests.cpp endif nodist_test_bitcoin_SOURCES = $(BUILT_SOURCES) |