Bump luzer with sanitizers support #133
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Needed for the following commit.
ligurio
force-pushed
the
ligurio/gh-xxxx-bump-luzer-sanitizers
branch
from
2c7a363 to
9fc045c
Compare
Buristan
approved these changes
Jun 6, 2025
| @@ -16,6 +16,13 @@ lapi_tests_make_lua_path(LUA_PATH | |||
| ${CMAKE_CURRENT_SOURCE_DIR}/?.lua | |||
| ) | |||
|
|
|||
| list(APPEND TEST_ENV | |||
| "LUA_PATH=${LUA_PATH};" | |||
There was a problem hiding this comment.
Minor: I suppose there is no need for ; here and below, since it is already the list.
There was a problem hiding this comment.
LUA_PATH and LUA_CPATH are not touched in proposed patch, however, I've fixed for LD_PRELOAD_LIBS:
@@ -29,7 +33,7 @@ list(APPEND TEST_ENV
"LUA_CPATH=${LUA_CPATH};"
"ASAN_OPTIONS=detect_odr_violation=0;"
"LD_DYNAMIC_WEAK=1;"
- "LD_PRELOAD=${LD_PRELOAD_LIBS};"
+ "LD_PRELOAD=${LD_PRELOAD_LIBS}"
)
function(create_test)
Buristan
approved these changes
Jun 6, 2025
| @@ -26,7 +26,7 @@ endif() | |||
|
|
|||
| ExternalProject_Add(bundled-luzer | |||
| GIT_REPOSITORY https://github.com/ligurio/luzer | |||
| GIT_TAG 82d41c5f350296ca351e785a24c914165a0e8033 | |||
| GIT_TAG ligurio/gh-xxxx-build-sanitizer-libs | |||
There was a problem hiding this comment.
Don't forget to update this part after the ligurio/luzer#38 is merged.
There was a problem hiding this comment.
Added a reminder as a separate commit:
commit 94b11bbd294525c5543ff1999f7b241a2903f1c8 (HEAD -> ligurio/gh-xxxx-bump-luzer-sanitizers)
Author: Sergey Bronnikov <estetus@gmail.com>
Date: Mon Jun 9 17:01:31 2025 +0300
cmake: bump luzer version [TODO]
Must be updated after merging https://github.com/ligurio/luzer/pull/38
diff --git a/cmake/BuildLuzer.cmake b/cmake/BuildLuzer.cmake
index a55e7ce..e37edfb 100644
--- a/cmake/BuildLuzer.cmake
+++ b/cmake/BuildLuzer.cmake
@@ -26,7 +26,7 @@ endif()
ExternalProject_Add(bundled-luzer
GIT_REPOSITORY https://github.com/ligurio/luzer
- GIT_TAG 82d41c5f350296ca351e785a24c914165a0e8033
+ GIT_TAG ligurio/gh-xxxx-build-sanitizer-libs
GIT_PROGRESS TRUE
GIT_SHALLOW FALSE
SOURCE_DIR ${LUZER_DIR}/source
| @@ -16,11 +16,20 @@ lapi_tests_make_lua_path(LUA_PATH | |||
| ${CMAKE_CURRENT_SOURCE_DIR}/?.lua | |||
| ) | |||
|
|
|||
| set(DSO_SANITIZER_PATH "${PROJECT_BINARY_DIR}/luzer/build/luzer") | |||
| set(DSO_ASAN_PATH "${DSO_SANITIZER_PATH}/asan_with_fuzzer.so") | |||
There was a problem hiding this comment.
I would rather name it fuzzer_with_asan.so and fuzzer_with_ubsan.so instead. Feel free to ignore.
There was a problem hiding this comment.
This should be addressed here, right? ligurio/luzer#38
| set(DSO_ASAN_PATH "${DSO_SANITIZER_PATH}/asan_with_fuzzer.so") | ||
| set(DSO_UBSAN_PATH "${DSO_SANITIZER_PATH}/ubsan_with_fuzzer.so") | ||
|
|
||
| if(ENABLE_ASAN OR ENABLE_UBSAN) |
There was a problem hiding this comment.
Maybe it is better to append the LD_PRELOAD_LIBS env var for each type of sanitizer to avoid loading the UBSan version when only ASan is requested.
There was a problem hiding this comment.
Updated:
--- a/tests/lapi/CMakeLists.txt
+++ b/tests/lapi/CMakeLists.txt
@@ -20,8 +20,12 @@ set(DSO_SANITIZER_PATH "${PROJECT_BINARY_DIR}/luzer/build/luzer")
set(DSO_ASAN_PATH "${DSO_SANITIZER_PATH}/asan_with_fuzzer.so")
set(DSO_UBSAN_PATH "${DSO_SANITIZER_PATH}/ubsan_with_fuzzer.so")
-if(ENABLE_ASAN OR ENABLE_UBSAN)
- set(LD_PRELOAD_LIBS "${DSO_ASAN_PATH}:${DSO_UBSAN_PATH}")
+if(ENABLE_ASAN)
+ list(APPEND LD_PRELOAD_LIBS ${DSO_ASAN_PATH})
+endif()
+
+if(ENABLE_UBSAN)
+ list(APPEND LD_PRELOAD_LIBS ${DSO_UBSAN_PATH})
endif()
list(APPEND TEST_ENV
|
C stack overflow: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Depends on ligurio/luzer#38.