Skip to content

Commit 80fc55b

Browse files
committed
unit-test: fix SANITIZE_ADDRESS generator expression
The BOOL:... generator expression always returned 1 even if the SANITIZE_ADDRESS/SANITIZE_UNDEFINED options were set to OFF, as the actual strings were used and not their values. See also: https://cmake.org/cmake/help/latest/manual/cmake-generator-expressions.7.html#genex:BOOL
1 parent 6f94c6f commit 80fc55b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

test/unit-test/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,8 @@ foreach(I RANGE 0 ${TEST_LIST_LEN} 2)
255255
add_executable(${EXE} test_${TEST_NAME}.c framework/eh_personality.c)
256256
# asan must be first library in linking order
257257
target_link_libraries(${EXE} PRIVATE
258-
$<$<BOOL:SANITIZE_ADDRESS>:asan>
259-
$<$<BOOL:SANITIZE_UNDEFINED>:-fsanitize=undefined>
258+
$<$<BOOL:${SANITIZE_ADDRESS}>:asan>
259+
$<$<BOOL:${SANITIZE_UNDEFINED}>:-fsanitize=undefined>
260260
-Wl,--start-group
261261
c-unit-tests_rust_c
262262
bitbox
@@ -281,8 +281,8 @@ foreach(TEST_NAME ${U2F_TESTS})
281281
# This tests link to our code
282282
add_executable(${EXE} test_${TEST_NAME}.c framework/mock_hidapi.c framework/eh_personality.c)
283283
target_link_libraries(${EXE} PRIVATE
284-
$<$<BOOL:SANITIZE_ADDRESS>:asan>
285-
$<$<BOOL:SANITIZE_UNDEFINED>:-fsanitize=undefined>
284+
$<$<BOOL:${SANITIZE_ADDRESS}>:asan>
285+
$<$<BOOL:${SANITIZE_UNDEFINED}>:-fsanitize=undefined>
286286
-Wl,--start-group
287287
c-unit-tests_rust_c
288288
bitbox
@@ -298,8 +298,8 @@ foreach(TEST_NAME ${U2F_TESTS})
298298
add_executable(${EXE} test_${TEST_NAME}.c)
299299
# asan must be first library in linking order
300300
target_link_libraries(${EXE} PRIVATE
301-
$<$<BOOL:SANITIZE_ADDRESS>:asan>
302-
$<$<BOOL:SANITIZE_UNDEFINED>:-fsanitize=undefined>
301+
$<$<BOOL:${SANITIZE_ADDRESS}>:asan>
302+
$<$<BOOL:${SANITIZE_UNDEFINED}>:-fsanitize=undefined>
303303
u2f-util
304304
hidapi-hidraw
305305
${CMOCKA_LIBRARIES}

0 commit comments

Comments
 (0)