Skip to content

fix memory_mallctl_helper_test when jemalloc is installed #2555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ahornby wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix memory_mallctl_helper_test when jemalloc is installed #2555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec33753
fix intermittent failure in HeapVectorTypes.SimpleSetTest (#2554)
ahornby Jan 12, 2026
da08327
fix memory_mallctl_helper_test when jemalloc is installed
ahornby Jan 12, 2026
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ REMOVE_MATCHES_FROM_LISTS(files hfiles
"^${FOLLY_DIR_REGEX_ESCAPED}/(.*/)?tool/"
"^${FOLLY_DIR_REGEX_ESCAPED}/facebook/"
"^${FOLLY_DIR_REGEX_ESCAPED}/rust/"
"^${FOLLY_DIR_REGEX_ESCAPED}/ext/buck2/"
"Benchmark.cpp$"
"Test.cpp$"
)
Expand Down Expand Up @@ -1031,7 +1030,6 @@ if (BUILD_TESTS OR BUILD_BENCHMARKS)
SOURCES shared_from_this_ptr_test.cpp
TEST memory_thread_cached_arena_test WINDOWS_DISABLED
SOURCES ThreadCachedArenaTest.cpp
TEST memory_mallctl_helper_test SOURCES MallctlHelperTest.cpp
TEST memory_uninitialized_memory_hacks_test
SOURCES UninitializedMemoryHacksTest.cpp

Expand Down Expand Up @@ -1262,6 +1260,18 @@ if (BUILD_TESTS OR BUILD_BENCHMARKS)
TEST json_json_schema_test SOURCES JSONSchemaTest.cpp
)

if (FOLLY_USE_JEMALLOC)
folly_define_tests(
DIRECTORY memory/test/
TEST memory_mallctl_helper_test SOURCES MallctlHelperTest.cpp
)
find_library(FOLLY_JEMALLOC_LIB jemalloc)
if (FOLLY_JEMALLOC_LIB)
target_link_libraries(fbstring_test PRIVATE ${FOLLY_JEMALLOC_LIB})
target_link_libraries(memory_mallctl_helper_test PRIVATE ${FOLLY_JEMALLOC_LIB})
endif()
endif()

if (${LIBSODIUM_FOUND})
folly_define_tests(
DIRECTORY crypto/test/
Expand All @@ -1287,10 +1297,7 @@ if (BUILD_TESTS OR BUILD_BENCHMARKS)
add_library(singleton_thread_local_overload
SHARED ${FOLLY_DIR}/test/SingletonThreadLocalTestOverload.cpp)
apply_folly_compile_options_to_target(singleton_thread_local_overload)
set_target_properties(singleton_thread_local_overload PROPERTIES
PREFIX ""
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/folly/test
)
set_target_properties(singleton_thread_local_overload PROPERTIES PREFIX "")
target_link_libraries(singleton_thread_local_overload PRIVATE folly)
folly_define_tests(
DIRECTORY test/
Expand Down
8 changes: 6 additions & 2 deletions folly/container/test/heap_vector_types_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,12 @@ TEST(HeapVectorTypes, SimpleSetTest) {
EXPECT_TRUE(s == s2);

auto it = s2.lower_bound(32);
if (*it == 32) {
s2.erase(it);
if (it != s2.end()) {
if (*it == 32) {
s2.erase(it);
} else {
s2.erase(32);
}
it = s2.lower_bound(32);
}
check_invariant(s2);
Expand Down
Loading