Merge pull request #5900

3fcfbc8 Add a consistency check for the block chain data structures (Pieter Wuille)

src/test/test_bitcoin.cpp

@@ -30,6 +30,7 @@ BasicTestingSetup::BasicTestingSetup()
 {
         SetupEnvironment();
         fPrintToDebugLog = false; // don't want to write to debug.log file
+        fCheckBlockIndex = true;
         SelectParams(CBaseChainParams::MAIN);
 }
 BasicTestingSetup::~BasicTestingSetup()