LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Fix testing setup

Browse source 
There were some problems with the existing testing setup:

 - Makefile rules for test-file compilation used CFLAGS instead of
   CXXFLAGS in makefile.unix
This commit is contained in:
Vegard Nossum 2011-07-31 20:00:38 +02:00 committed by Gavin Andresen
parent 02962ba848
commit e707d29dd6
7 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
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) obj/test/%.o: obj/test/%.cpp $(HEADERS)
i586-mingw32msvc-g++ -c $(CFLAGS) -o $@ $< 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 i586-mingw32msvc-g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) -lboost_unit_test_framework-mt-s

2
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) obj/test/%.o: obj/test/%.cpp $(HEADERS)
g++ -c $(CFLAGS) -o $@ $< 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) g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
clean: clean:

2
src/makefile.osx
View file

@ -79,7 +79,7 @@ bitcoind: $(OBJS:obj/%=obj/nogui/%)
obj/test/%.o: test/%.cpp $(HEADERS) obj/test/%.o: test/%.cpp $(HEADERS)
$(CXX) -c $(CFLAGS) -o $@ $< $(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 $(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) -lboost_unit_test_framework
clean: clean:

6
src/makefile.unix
View file

@ -78,10 +78,10 @@ bitcoind: $(OBJS:obj/%=obj/nogui/%)
$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS) $(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
obj/test/%.o: test/%.cpp $(HEADERS) obj/test/%.o: test/%.cpp $(HEADERS)
$(CXX) -c $(CFLAGS) -o $@ $< $(CXX) -c $(CXXFLAGS) -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 $(CXX) $(CXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-Bstatic -lboost_unit_test_framework $(LIBS)
clean: clean:
-rm -f bitcoin bitcoind test_bitcoin -rm -f bitcoin bitcoind test_bitcoin

10
src/test/test_bitcoin.cpp
View file

@ -1,6 +1,16 @@
#define BOOST_TEST_MODULE uint160 #define BOOST_TEST_MODULE uint160
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include "../main.h"
#include "../wallet.h"
#include "uint160_tests.cpp" #include "uint160_tests.cpp"
#include "uint256_tests.cpp" #include "uint256_tests.cpp"
CWallet* pwalletMain;
void Shutdown(void* parg)
{
exit(0);
}

2
src/test/uint160_tests.cpp
View file

@ -1,3 +1,5 @@
#include <boost/test/unit_test.hpp>
#include "../uint256.h" #include "../uint256.h"
BOOST_AUTO_TEST_SUITE(uint160_tests) BOOST_AUTO_TEST_SUITE(uint160_tests)

2
src/test/uint256_tests.cpp
View file

@ -1,3 +1,5 @@
#include <boost/test/unit_test.hpp>
#include "../uint256.h" #include "../uint256.h"
BOOST_AUTO_TEST_SUITE(uint256_tests) BOOST_AUTO_TEST_SUITE(uint256_tests)