diff options
| author | Etienne Petrel <etienne.petrel@mongodb.com> | 2022-11-15 02:28:45 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-11-15 03:01:50 +0000 |
| commit | ac8383be47116cdb838d398e6f9a473275ca83d6 (patch) | |
| tree | 7ccb132bf0b8d681660fb16e1eda0f4a3d6f16f8 | |
| parent | 9df5aa2518b9f032b44fa4bbeacfa8ff8a08561b (diff) | |
| download | mongo-ac8383be47116cdb838d398e6f9a473275ca83d6.tar.gz | |
Import wiredtiger: aff91a0de3bbe8278616ce60c8a31b2ff22bb155 from branch mongodb-master
ref: ff6a2d4eb6..aff91a0de3
for: 6.2.0-rc0
WT-9814 Generate dSYM bundles for macOS core dumps
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/test/ctest_helpers.cmake | 20 |
2 files changed, 21 insertions, 1 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 18b2e6aeb11..5c0fbcda906 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-master", - "commit": "ff6a2d4eb63aeff401a417d45d9c29264cfb2316" + "commit": "aff91a0de3bbe8278616ce60c8a31b2ff22bb155" } diff --git a/src/third_party/wiredtiger/test/ctest_helpers.cmake b/src/third_party/wiredtiger/test/ctest_helpers.cmake index 686037beefd..3095f0ad7ec 100644 --- a/src/third_party/wiredtiger/test/ctest_helpers.cmake +++ b/src/third_party/wiredtiger/test/ctest_helpers.cmake @@ -37,6 +37,26 @@ function(create_test_executable target) # Define our test executable. add_executable(${target} ${CREATE_TEST_SOURCES}) + + # For MacOS builds we need to generate a dSYM bundle that contains the debug symbols for each + # executable. The name of the binary will either be the name of the target or some other name + # passed to this function. We need to use the correct one for the dsymutil. + if (WT_DARWIN) + if("${CREATE_TEST_EXECUTABLE_NAME}" STREQUAL "") + set(test_name "${target}") + else() + set(test_name "${CREATE_TEST_EXECUTABLE_NAME}") + endif() + + add_custom_command( + TARGET ${target} POST_BUILD + COMMAND dsymutil ${test_name} + WORKING_DIRECTORY ${test_binary_dir} + COMMENT "Running dsymutil on ${test_name}" + VERBATIM + ) + endif() + # If we want the output binary to be a different name than the target. if (NOT "${CREATE_TEST_EXECUTABLE_NAME}" STREQUAL "") set_target_properties(${target} |