From 8cbe1f4f5870a165be729cabb9b55dcbf0f85e09 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Mon, 9 Mar 2015 15:04:12 +0100 Subject: [PATCH] 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 --- src/test/main_tests.cpp | 4 +++- src/test/wallet_tests.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/test/main_tests.cpp b/src/test/main_tests.cpp index 2a72a220a..1927f3dea 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_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 289cc8c90..25c8fab33 100644 --- a/src/test/wallet_tests.cpp +++ b/src/test/wallet_tests.cpp @@ -9,6 +9,8 @@ #include #include +#include "test/test_bitcoin.h" + #include #include @@ -23,7 +25,7 @@ using namespace std; typedef set > CoinSet; -BOOST_AUTO_TEST_SUITE(wallet_tests) +BOOST_FIXTURE_TEST_SUITE(wallet_tests, TestingSetup) static CWallet wallet; static vector vCoins;