From 5a555298edbba9b9578e0636064b3c09a0bc5891 Mon Sep 17 00:00:00 2001 From: fanquake Date: Tue, 11 Oct 2022 16:03:35 +0800 Subject: [PATCH 1/2] build: add missing event cflags to libbitcoin_util The fact that this is missing is currently masked by the inclusion of BOOST_CPPFLAGS. Cherry-picked from: 058eb69c --- src/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile.am b/src/Makefile.am index df7cee91c..2a886e67e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -560,6 +560,7 @@ libbitcoin_util_a_SOURCES = \ $(BITCOIN_CORE_H) if USE_LIBEVENT +libbitcoin_util_a_CPPFLAGS += $(EVENT_CFLAGS) libbitcoin_util_a_SOURCES += util/url.cpp endif From a469ba73a34cc4a9336e0717acde304f46088a4d Mon Sep 17 00:00:00 2001 From: Patrick Lodder Date: Fri, 6 Oct 2023 16:03:24 -0400 Subject: [PATCH 2/2] qa: allow for variable fs::create_directory prefix to duplicate dir In boost 1.76 boost::filesystem::create_directories was reworked to properly return errors. Boost < 1.75 will not throw errors, boost 1.75 will throw errors depending on the OS used, and boost 1.76+ will always throw the error correctly. Because the function that throws the error is different between the currently pinned boost 1.70 and later versions that are included with system packages, this commit changes the error text in the test for duplicate wallet file creation to detect both, by checking for "*boost::filesystem::create_director*". See: https://www.boost.org/users/history/version_1_76_0.html --- test/functional/wallet_multiwallet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/wallet_multiwallet.py b/test/functional/wallet_multiwallet.py index e514a817d..0c6b01eae 100755 --- a/test/functional/wallet_multiwallet.py +++ b/test/functional/wallet_multiwallet.py @@ -138,7 +138,7 @@ class MultiWalletTest(BitcoinTestFramework): # should raise rpc error if wallet path can't be created err_code = -4 if self.options.descriptors else -1 - assert_raises_rpc_error(err_code, "boost::filesystem::create_directory:", self.nodes[0].createwallet, "w8/bad") + assert_raises_rpc_error(err_code, "boost::filesystem::create_director", self.nodes[0].createwallet, "w8/bad") # check that all requested wallets were created self.stop_node(0)