diff options
| author | merge-script <fanquake@gmail.com> | 2024-05-21 21:14:30 +0100 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-05-21 21:14:30 +0100 |
| commit | 2ec0a28a37dbb50d463899f53c28fb96905d97b7 (patch) | |
| tree | 3cf8f4444d394df3e771d88a6ea97fd7d04f0cec /src/test | |
| parent | 6c13b1375f8fd810f46f5650e01a464ee63cfa46 (diff) | |
| parent | 17fe948cce2eb75f0f3f4b0db9d0d90648c7d4af (diff) | |
Merge bitcoin/bitcoin#30137: build: Remove `--enable-threadlocal`
17fe948cce2eb75f0f3f4b0db9d0d90648c7d4af build: remove --enable-threadlocal (fanquake)
1e7c20bc19a216269c646177ab90cfa084c096a5 doc: remove comment about using thread_local (fanquake)
5bba43312c0ceccfe18bd4d086e12ec0497ed926 build: Enable `thread_local` for MinGW-w64 builds (Hennadii Stepanov)
Pull request description:
Includes a commit from #30099.
Closes #29952.
ACKs for top commit:
laanwj:
Code review ACK 17fe948cce2eb75f0f3f4b0db9d0d90648c7d4af
maflcko:
utACK 17fe948cce2eb75f0f3f4b0db9d0d90648c7d4af
hebasto:
ACK 17fe948cce2eb75f0f3f4b0db9d0d90648c7d4af.
theuni:
utACK 17fe948cce2eb75f0f3f4b0db9d0d90648c7d4af
Tree-SHA512: 2aad6d19e79c4d6d7aefd0f41b215ac8d9320f5908808221d78e6ee1c77503832a02759bee2ad397e235b6739e22aca8dcf5c5ef8854deb8c697b18ac56a06da
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/util/random.h | 5 | ||||
| -rw-r--r-- | src/test/util_threadnames_tests.cpp | 7 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/test/util/random.h b/src/test/util/random.h index c910bd6a3a..18ab425e48 100644 --- a/src/test/util/random.h +++ b/src/test/util/random.h @@ -14,9 +14,8 @@ /** * This global and the helpers that use it are not thread-safe. * - * If thread-safety is needed, the global could be made thread_local (given - * that thread_local is supported on all architectures we support) or a - * per-thread instance could be used in the multi-threaded test. + * If thread-safety is needed, a per-thread instance could be + * used in the multi-threaded test. */ extern FastRandomContext g_insecure_rand_ctx; diff --git a/src/test/util_threadnames_tests.cpp b/src/test/util_threadnames_tests.cpp index df5b1a4461..174052d5fa 100644 --- a/src/test/util_threadnames_tests.cpp +++ b/src/test/util_threadnames_tests.cpp @@ -11,8 +11,6 @@ #include <thread> #include <vector> -#include <config/bitcoin-config.h> // IWYU pragma: keep - #include <boost/test/unit_test.hpp> BOOST_AUTO_TEST_SUITE(util_threadnames_tests) @@ -52,11 +50,6 @@ std::set<std::string> RenameEnMasse(int num_threads) */ BOOST_AUTO_TEST_CASE(util_threadnames_test_rename_threaded) { -#if !defined(HAVE_THREAD_LOCAL) - // This test doesn't apply to platforms where we don't have thread_local. - return; -#endif - std::set<std::string> names = RenameEnMasse(100); BOOST_CHECK_EQUAL(names.size(), 100U); |