This commit is contained in:
jl777
2016-12-12 12:53:54 +02:00
parent a65789c8f1
commit 8962d0405b
2 changed files with 6 additions and 6 deletions

View File

@@ -518,10 +518,10 @@ endif
@test -f $(PROTOC)
$(AM_V_GEN) $(PROTOC) --cpp_out=$(@D) --proto_path=$(abspath $(<D) $<)
if ENABLE_TESTS
include Makefile.test.include
include Makefile.gtest.include
endif
#if ENABLE_TESTS
#include Makefile.test.include
#include Makefile.gtest.include
#endif
if ENABLE_QT
include Makefile.qt.include

View File

@@ -3,9 +3,9 @@ TESTS += qt/test/test_bitcoin-qt
TEST_QT_MOC_CPP = qt/test/moc_uritests.cpp
#if ENABLE_WALLET
if ENABLE_WALLET
TEST_QT_MOC_CPP += qt/test/moc_paymentservertests.cpp
#endif
endif
TEST_QT_H = \
qt/test/uritests.h \