Merge #9904: test: Fail if InitBlockIndex fails

laanwj · laanwj · commit 58861ad91b49 · 2017-03-03T07:16:32.000+01:00
6485466 test: Report InitBlockIndex result (Wladimir J. van der Laan) Tree-SHA512: 8e1408aa8d56ec1873190f886af24aa68b0555ec4996b2b8a5a39a51ded58c8fba5843c07881ed33ab6dcb00e62c2322bcf2a6fb8f1083f77e0d93e7295ab938
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
@@ -69,11 +69,11 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha
         pblocktree = new CBlockTreeDB(1 << 20, true);
         pcoinsdbview = new CCoinsViewDB(1 << 23, true);
         pcoinsTip = new CCoinsViewCache(pcoinsdbview);
-        InitBlockIndex(chainparams);
+        BOOST_REQUIRE(InitBlockIndex(chainparams));
         {
             CValidationState state;
             bool ok = ActivateBestChain(state, chainparams);
-            BOOST_CHECK(ok);
+            BOOST_REQUIRE(ok);
         }
         nScriptCheckThreads = 3;
         for (int i=0; i < nScriptCheckThreads-1; i++)

Original file line number	Diff line number	Diff line change
`@@ -69,11 +69,11 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha`
`69`	`69`	`pblocktree = new CBlockTreeDB(1 << 20, true);`
`70`	`70`	`pcoinsdbview = new CCoinsViewDB(1 << 23, true);`
`71`	`71`	`pcoinsTip = new CCoinsViewCache(pcoinsdbview);`
`72`		`- InitBlockIndex(chainparams);`
	`72`	`+ BOOST_REQUIRE(InitBlockIndex(chainparams));`
`73`	`73`	`{`
`74`	`74`	`CValidationState state;`
`75`	`75`	`bool ok = ActivateBestChain(state, chainparams);`
`76`		`- BOOST_CHECK(ok);`
	`76`	`+ BOOST_REQUIRE(ok);`
`77`	`77`	`}`
`78`	`78`	`nScriptCheckThreads = 3;`
`79`	`79`	`for (int i=0; i < nScriptCheckThreads-1; i++)`