Skip to content

Commit 49ab8e0

Browse files
committed
xxx
1 parent b237f20 commit 49ab8e0

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

.github/workflows/test.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ jobs:
6161
autoconf \
6262
automake \
6363
libtool \
64-
llvm \
6564
util-linux
6665
6766
- name: Running CMake (PUC Rio Lua -current)

cmake/CodeCoverage.cmake

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
find_program(LLVM_COV llvm-cov)
22
find_program(LLVM_PROFDATA llvm-profdata)
33

4-
if(NOT LLVM_COV OR NOT LLVM_PROFDATA)
5-
message(FATAL_ERROR
6-
"Required LLVM coverage tools not found (llvm-cov and llvm-profdata).")
4+
set(target_name "coverage-report")
5+
if(NOT LLVM_PROFDATA AND NOT LLVM_COV)
6+
set(MESSAGE "${target_name} is a dummy target")
7+
add_custom_target(${target_name}
8+
COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --red ${MESSAGE}
9+
COMMENT ${MESSAGE}
10+
)
11+
message(WARNING "Either `llvm-profdata' or `llvm-cov` not found, "
12+
"so target ${target_name} is dummy.")
13+
return()
714
endif()
815

916
set(CODE_COVERAGE_DIR "${PROJECT_BINARY_DIR}/coverage")
@@ -48,7 +55,7 @@ if(USE_LUA)
4855
set(LUA_EXECUTABLE ${PROJECT_BINARY_DIR}/lua-master/source/lua)
4956
endif()
5057

51-
add_custom_target(coverage-report
58+
add_custom_target(${target_name}
5259
COMMAND ${LLVM_PROFDATA} merge -sparse ${LLVM_COV_PROFRAW_MASK}
5360
-o ${LLVM_COV_PROFDATA}
5461
COMMAND ${LLVM_COV} show --format=html ${LLVM_COV_FLAGS} ${LUA_EXECUTABLE}

tests/capi/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ function(create_test)
100100
)
101101
if (USE_LUA)
102102
list(APPEND TEST_ENV
103-
asan_options='detect_invalid_pointer_pairs=2'
103+
ASAN_OPTIONS='detect_invalid_pointer_pairs=2'
104104
)
105105
endif()
106106
set_tests_properties(${test_name} PROPERTIES

0 commit comments

Comments
 (0)