diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-11-06 19:12:47 +0100 |
|---|---|---|
| committer | James Hilliard <james.hilliard1@gmail.com> | 2018-10-09 03:36:14 -0600 |
| commit | 9dcf6c0dfec51f2a49edef537f377422d6dbdceb (patch) | |
| tree | 68628f5648acc166e1bdbd5f3cfbe0cec5caa8d1 /src/qt/test | |
| parent | 1d1417430c829a0c21bf5a2fe4a5b2f592a9423f (diff) | |
| download | bitcoin-9dcf6c0dfec51f2a49edef537f377422d6dbdceb.tar.xz | |
build: Add --disable-bip70 configure option
This patch adds a --disable-bip70 configure option that disables BIP70
payment request support. When disabled, this removes the dependency of
the GUI on OpenSSL and Protobuf.
Diffstat (limited to 'src/qt/test')
| -rw-r--r-- | src/qt/test/compattests.cpp | 6 | ||||
| -rw-r--r-- | src/qt/test/test_main.cpp | 6 | ||||
| -rw-r--r-- | src/qt/test/wallettests.cpp | 1 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/qt/test/compattests.cpp b/src/qt/test/compattests.cpp index af5c69ea9a..6750c543da 100644 --- a/src/qt/test/compattests.cpp +++ b/src/qt/test/compattests.cpp @@ -2,7 +2,13 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) +#include <config/bitcoin-config.h> +#endif + +#if defined(ENABLE_WALLET) && defined(ENABLE_BIP70) #include <qt/paymentrequestplus.h> // this includes protobuf's port.h which defines its own bswap macos +#endif #include <qt/test/compattests.h> diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index df65a85fb5..28df4ebf26 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -14,9 +14,11 @@ #ifdef ENABLE_WALLET #include <qt/test/addressbooktests.h> +#ifdef ENABLE_BIP70 #include <qt/test/paymentservertests.h> +#endif // ENABLE_BIP70 #include <qt/test/wallettests.h> -#endif +#endif // ENABLE_WALLET #include <QApplication> #include <QObject> @@ -74,7 +76,7 @@ int main(int argc, char *argv[]) if (QTest::qExec(&test1) != 0) { fInvalid = true; } -#ifdef ENABLE_WALLET +#if defined(ENABLE_WALLET) && defined(ENABLE_BIP70) PaymentServerTests test2; if (QTest::qExec(&test2) != 0) { fInvalid = true; diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp index a0cfe8ae87..2284be4121 100644 --- a/src/qt/test/wallettests.cpp +++ b/src/qt/test/wallettests.cpp @@ -2,6 +2,7 @@ #include <qt/test/util.h> #include <interfaces/node.h> +#include <base58.h> #include <qt/bitcoinamountfield.h> #include <qt/callback.h> #include <qt/optionsmodel.h> |