Browse Source

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
tags/v0.15.1
Vegard Nossum 10 years ago
parent
commit
e707d29dd6

+ 1
- 1
src/makefile.linux-mingw View File

@@ -90,7 +90,7 @@ bitcoind.exe: $(OBJS:obj/%=obj/nogui/%) obj/ui_res.o
obj/test/%.o: obj/test/%.cpp $(HEADERS)
i586-mingw32msvc-g++ -c $(CFLAGS) -o $@ $<

test_bitcoin.exe: obj/test/test_bitcoin.o
test_bitcoin.exe: obj/test/test_bitcoin.o $(filter-out obj/nogui/init.o,$(OBJS:obj/%=obj/nogui/%))
i586-mingw32msvc-g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) -lboost_unit_test_framework-mt-s



+ 1
- 1
src/makefile.mingw View File

@@ -86,7 +86,7 @@ bitcoind.exe: $(OBJS:obj/%=obj/nogui/%) obj/ui_res.o
obj/test/%.o: obj/test/%.cpp $(HEADERS)
g++ -c $(CFLAGS) -o $@ $<

test_bitcoin: obj/test/test_bitcoin.o
test_bitcoin.exe: obj/test/test_bitcoin.o $(filter-out obj/nogui/init.o,$(OBJS:obj/%=obj/nogui/%))
g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)

clean:

+ 1
- 1
src/makefile.osx View File

@@ -79,7 +79,7 @@ bitcoind: $(OBJS:obj/%=obj/nogui/%)
obj/test/%.o: test/%.cpp $(HEADERS)
$(CXX) -c $(CFLAGS) -o $@ $<

test_bitcoin: obj/test/test_bitcoin.o
test_bitcoin: obj/test/test_bitcoin.o $(filter-out obj/nogui/init.o,$(OBJS:obj/%=obj/nogui/%))
$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) -lboost_unit_test_framework

clean:

+ 3
- 3
src/makefile.unix View File

@@ -78,10 +78,10 @@ bitcoind: $(OBJS:obj/%=obj/nogui/%)
$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)

obj/test/%.o: test/%.cpp $(HEADERS)
$(CXX) -c $(CFLAGS) -o $@ $<
$(CXX) -c $(CXXFLAGS) -o $@ $<

test_bitcoin: obj/test/test_bitcoin.o
$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) -lboost_unit_test_framework
test_bitcoin: obj/test/test_bitcoin.o $(filter-out obj/nogui/init.o,$(OBJS:obj/%=obj/nogui/%))
$(CXX) $(CXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-Bstatic -lboost_unit_test_framework $(LIBS)

clean:
-rm -f bitcoin bitcoind test_bitcoin

+ 10
- 0
src/test/test_bitcoin.cpp View File

@@ -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);
}

+ 2
- 0
src/test/uint160_tests.cpp View File

@@ -1,3 +1,5 @@
#include <boost/test/unit_test.hpp>

#include "../uint256.h"

BOOST_AUTO_TEST_SUITE(uint160_tests)

+ 2
- 0
src/test/uint256_tests.cpp View File

@@ -1,3 +1,5 @@
#include <boost/test/unit_test.hpp>

#include "../uint256.h"

BOOST_AUTO_TEST_SUITE(uint256_tests)

Loading…
Cancel
Save