diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-05-23 19:23:35 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-05-23 19:32:52 +0200 |
| commit | ce8176d0389c0bc1eed42d85ad7e6c7f2bed64d9 (patch) | |
| tree | 457d5479aaf8bc6c427b24470d69aa4bb4454cb6 /src/Makefile.qttest.include | |
| parent | 46771514fa86b9a5a0e0af34c1abfa1da22212f7 (diff) | |
| parent | 108f04f2d973adac5313c7e4e17a59766a3cc1b6 (diff) | |
| download | bitcoin-ce8176d0389c0bc1eed42d85ad7e6c7f2bed64d9.tar.xz | |
Merge #10295: [qt] Move some WalletModel functions into CWallet
108f04f Add missing LOCK2 in CWallet::GetAvailableBalance (Russell Yanofsky)
429aa9e [test] Move some tests from qt -> wallet (Russell Yanofsky)
d944bd7 [qt] Move some WalletModel functions into CWallet (Russell Yanofsky)
ef8ca17 [test] Add tests for some walletmodel functions (Russell Yanofsky)
Tree-SHA512: f6384d9f2ff3f7fb173d414588c3e7dc8c311b8ed2ce2b0979fb824a0ed83a7302890ccd3d83197f07f6fdcb6b1ca151584d90ea1961d88dfe8956c87087cde8
Diffstat (limited to 'src/Makefile.qttest.include')
| -rw-r--r-- | src/Makefile.qttest.include | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include index 948e13a9e1..391b9ebdf6 100644 --- a/src/Makefile.qttest.include +++ b/src/Makefile.qttest.include @@ -46,7 +46,8 @@ qt_test_test_bitcoin_qt_SOURCES = \ if ENABLE_WALLET qt_test_test_bitcoin_qt_SOURCES += \ qt/test/paymentservertests.cpp \ - qt/test/wallettests.cpp + qt/test/wallettests.cpp \ + wallet/test/wallet_test_fixture.cpp endif nodist_qt_test_test_bitcoin_qt_SOURCES = $(TEST_QT_MOC_CPP) |