aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-03-09 15:04:12 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2015-03-09 15:04:59 +0100
commit8cbe1f4f5870a165be729cabb9b55dcbf0f85e09 (patch)
tree9730f249914a647714ae0af0546a72808180695e /src
parentcdae53e456ad35216e33a90f1681aade546cc431 (diff)
tests: change main and wallet tests to BOOST_FIXTURE_TEST_SUITE
Avoid this travis error: test_bitcoin: chainparams.cpp:330: const CChainParams& Params(): Assertion `pCurrentParams' failed. unknown location(0): fatal error in "subsidy_limit_test": signal: SIGABRT (application abort requested) test/allocator_tests.cpp(116): last checkpoint
Diffstat (limited to 'src')
-rw-r--r--src/test/main_tests.cpp4
-rw-r--r--src/test/wallet_tests.cpp4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/test/main_tests.cpp b/src/test/main_tests.cpp
index 2a72a220a4..1927f3deab 100644
--- a/src/test/main_tests.cpp
+++ b/src/test/main_tests.cpp
@@ -5,9 +5,11 @@
#include "primitives/transaction.h"
#include "main.h"
+#include "test/test_bitcoin.h"
+
#include <boost/test/unit_test.hpp>
-BOOST_AUTO_TEST_SUITE(main_tests)
+BOOST_FIXTURE_TEST_SUITE(main_tests, TestingSetup)
BOOST_AUTO_TEST_CASE(subsidy_limit_test)
{
diff --git a/src/test/wallet_tests.cpp b/src/test/wallet_tests.cpp
index 289cc8c905..25c8fab335 100644
--- a/src/test/wallet_tests.cpp
+++ b/src/test/wallet_tests.cpp
@@ -9,6 +9,8 @@
#include <utility>
#include <vector>
+#include "test/test_bitcoin.h"
+
#include <boost/foreach.hpp>
#include <boost/test/unit_test.hpp>
@@ -23,7 +25,7 @@ using namespace std;
typedef set<pair<const CWalletTx*,unsigned int> > CoinSet;
-BOOST_AUTO_TEST_SUITE(wallet_tests)
+BOOST_FIXTURE_TEST_SUITE(wallet_tests, TestingSetup)
static CWallet wallet;
static vector<COutput> vCoins;