diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-01-11 12:51:03 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-01-11 12:51:12 +0100 |
| commit | 061aff4c46babdc30bb9f52f874a24edd8d14d82 (patch) | |
| tree | 6a0820ae13a8131ce3a0e2e0acf3754089b88ba3 /src/qt/test | |
| parent | 054be736d4773804b51ed67d6b7fe0e1b15d1d1b (diff) | |
| parent | b7f4b6d35da7b63529a728eb9333fe424b2a5c6d (diff) | |
| download | bitcoin-061aff4c46babdc30bb9f52f874a24edd8d14d82.tar.xz | |
Merge pull request #3392
b7f4b6d GUI for --disable-wallet compiles and -disablewallet mode (Wladimir J. van der Laan)
ec41342 build: pass correct defs and include path to moc (Wladimir J. van der Laan)
Diffstat (limited to 'src/qt/test')
| -rw-r--r-- | src/qt/test/Makefile.am | 17 | ||||
| -rw-r--r-- | src/qt/test/test_main.cpp | 9 |
2 files changed, 22 insertions, 4 deletions
diff --git a/src/qt/test/Makefile.am b/src/qt/test/Makefile.am index 0150524337..da54ef376b 100644 --- a/src/qt/test/Makefile.am +++ b/src/qt/test/Makefile.am @@ -8,16 +8,27 @@ AM_CPPFLAGS += -I$(top_srcdir)/src \ bin_PROGRAMS = test_bitcoin-qt TESTS = test_bitcoin-qt -TEST_QT_MOC_CPP = moc_uritests.cpp moc_paymentservertests.cpp +TEST_QT_MOC_CPP = moc_uritests.cpp + +if ENABLE_WALLET +TEST_QT_MOC_CPP += moc_paymentservertests.cpp +endif TEST_QT_H = uritests.h paymentservertests.h paymentrequestdata.h BUILT_SOURCES = $(TEST_QT_MOC_CPP) test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) $(QT_TEST_INCLUDES) -test_bitcoin_qt_SOURCES = test_main.cpp uritests.cpp paymentservertests.cpp $(TEST_QT_H) +test_bitcoin_qt_SOURCES = test_main.cpp uritests.cpp $(TEST_QT_H) +if ENABLE_WALLET +test_bitcoin_qt_SOURCES += paymentservertests.cpp +endif nodist_test_bitcoin_qt_SOURCES = $(TEST_QT_MOC_CPP) -test_bitcoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER) $(LIBBITCOIN_WALLET) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) \ +test_bitcoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER) +if ENABLE_WALLET +test_bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET) +endif +test_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) \ $(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \ $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index ad0dfd9823..a2adb00327 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -1,5 +1,11 @@ #include "bitcoin-config.h" +#if defined(HAVE_CONFIG_H) +#include "bitcoin-config.h" +#endif + +#ifdef ENABLE_WALLET #include "paymentservertests.h" +#endif #include "uritests.h" #include <QCoreApplication> @@ -27,10 +33,11 @@ int main(int argc, char *argv[]) URITests test1; if (QTest::qExec(&test1) != 0) fInvalid = true; - +#ifdef ENABLE_WALLET PaymentServerTests test2; if (QTest::qExec(&test2) != 0) fInvalid = true; +#endif return fInvalid; } |