aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.test.include
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2018-10-18 10:58:18 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2018-10-18 10:58:59 +0200
commitd98777f302e1e53249ce50a4bb80b6a8f4f109cd (patch)
tree4fafc0fd13afc55d866e01b2ffcc74510846d973 /src/Makefile.test.include
parent9c5f0d542d1db507b3b9c87bd9de6d0d758d51c1 (diff)
parent2d471636eb9160ab51b08e491e3f003f57adbc36 (diff)
downloadbitcoin-d98777f302e1e53249ce50a4bb80b6a8f4f109cd.tar.xz
Merge #14146: wallet: Remove trailing separators from -walletdir arg
2d471636eb9160ab51b08e491e3f003f57adbc36 wallet: Remove trailing separators from -walletdir arg (Pierre Rochard) ea3009ee942188750480ca6cc273b2b91cf77ded wallet: Add walletdir arg unit tests (Pierre Rochard) Pull request description: If a user passes in a path with a trailing separator as the `walletdir`, multiple BerkeleyEnvironments may be created in the same directory which can lead to data corruption. Discovered while reviewing https://github.com/bitcoin/bitcoin/pull/12493#issuecomment-417147646 Tree-SHA512: f2bbf1749d904fd3f326b88f2ead58c8386034355910906d7faea155d518642e9cd4ceb3cae272f2d9d8feb61f126523e1c97502799d24e4315bb53e49fd7c09
Diffstat (limited to 'src/Makefile.test.include')
-rw-r--r--src/Makefile.test.include7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 6f3d29d652..4506d5dd6a 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -111,11 +111,14 @@ BITCOIN_TESTS += \
wallet/test/psbt_wallet_tests.cpp \
wallet/test/wallet_tests.cpp \
wallet/test/wallet_crypto_tests.cpp \
- wallet/test/coinselector_tests.cpp
+ wallet/test/coinselector_tests.cpp \
+ wallet/test/init_tests.cpp
BITCOIN_TEST_SUITE += \
wallet/test/wallet_test_fixture.cpp \
- wallet/test/wallet_test_fixture.h
+ wallet/test/wallet_test_fixture.h \
+ wallet/test/init_test_fixture.cpp \
+ wallet/test/init_test_fixture.h
endif
test_test_bitcoin_SOURCES = $(BITCOIN_TEST_SUITE) $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES)