diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-01-11 12:51:03 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-01-11 12:51:12 +0100 |
| commit | 061aff4c46babdc30bb9f52f874a24edd8d14d82 (patch) | |
| tree | 6a0820ae13a8131ce3a0e2e0acf3754089b88ba3 /src/qt/test/test_main.cpp | |
| parent | Merge pull request #3493 (diff) | |
| parent | GUI for --disable-wallet compiles and -disablewallet mode (diff) | |
| download | discoin-061aff4c46babdc30bb9f52f874a24edd8d14d82.tar.xz discoin-061aff4c46babdc30bb9f52f874a24edd8d14d82.zip | |
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/test_main.cpp')
| -rw-r--r-- | src/qt/test/test_main.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index ad0dfd982..a2adb0032 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; } |