Fix testing setup

There were some problems with the existing testing setup:

 - Makefile rules for test-file compilation used CFLAGS instead of
   CXXFLAGS in makefile.unix

3 files changed, 14 insertions, 0 deletions

diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 3b7d2d2f2c..3d7ee9084e 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -1,6 +1,16 @@
 #define BOOST_TEST_MODULE uint160
 #include <boost/test/unit_test.hpp>
 
+#include "../main.h"
+#include "../wallet.h"
+
 #include "uint160_tests.cpp"
 #include "uint256_tests.cpp"
 
+
+CWallet* pwalletMain;
+
+void Shutdown(void* parg)
+{
+	exit(0);
+}
diff --git a/src/test/uint160_tests.cpp b/src/test/uint160_tests.cpp
index 66ffd285b8..e85a9488e8 100644
--- a/src/test/uint160_tests.cpp
+++ b/src/test/uint160_tests.cpp
@@ -1,3 +1,5 @@
+#include <boost/test/unit_test.hpp>
+
 #include "../uint256.h"
 
 BOOST_AUTO_TEST_SUITE(uint160_tests)
diff --git a/src/test/uint256_tests.cpp b/src/test/uint256_tests.cpp
index cbae9bf6d2..f13b34944c 100644
--- a/src/test/uint256_tests.cpp
+++ b/src/test/uint256_tests.cpp
@@ -1,3 +1,5 @@
+#include <boost/test/unit_test.hpp>
+
 #include "../uint256.h"
 
 BOOST_AUTO_TEST_SUITE(uint256_tests)