diff options
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rwxr-xr-x | scripts/coverage.sh | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cf50c581..bb4de623 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -167,7 +167,7 @@ function(SANITIZER NAME FLAGS) if (${NAME}) if (USE_SANITIZER) message(FATAL_ERROR "Only one sanitizer allowed") - endif() + endif () set(USE_SANITIZER TRUE PARENT_SCOPE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAGS}" PARENT_SCOPE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS}" PARENT_SCOPE) @@ -185,7 +185,7 @@ if (USE_UBSAN) CHECK_CXX_COMPILER_FLAG("-fsanitize=undefined -fno-sanitize-recover -Wall -Werror" HAS_UBSAN_RECOVER_BARE) if (HAS_UBSAN_RECOVER_BARE) SANITIZER(USE_UBSAN "-fsanitize=undefined -fno-sanitize-recover -fsanitize-blacklist=${UBSAN_BLACKLIST}") - endif() + endif () CHECK_CXX_COMPILER_FLAG("-fsanitize=undefined -fno-sanitize-recover=all -Wall -Werror" HAS_UBSAN_RECOVER_ALL) if (HAS_UBSAN_RECOVER_ALL) SANITIZER(USE_UBSAN "-fsanitize=undefined -fno-sanitize-recover=all -fsanitize-blacklist=${UBSAN_BLACKLIST}") @@ -261,7 +261,11 @@ set_target_properties(libwabt PROPERTIES OUTPUT_NAME wabt) if (NOT EMSCRIPTEN) if (CODE_COVERAGE) add_definitions("-fprofile-arcs -ftest-coverage") - link_libraries(gcov) + if (COMPILER_IS_CLANG) + set(CMAKE_EXE_LINKER_FLAGS "--coverage") + else () + link_libraries(gcov) + endif () endif () function(wabt_executable name) diff --git a/scripts/coverage.sh b/scripts/coverage.sh index 5f4e922b..d24f7670 100755 --- a/scripts/coverage.sh +++ b/scripts/coverage.sh @@ -34,6 +34,6 @@ log_and_run() { } log_and_run lcov --zerocounters -d ${BIN_DIR} --rc lcov_branch_coverage=1 -log_and_run python test/run-tests.py --bindir ${BIN_DIR} +log_and_run test/run-tests.py --bindir ${BIN_DIR} log_and_run lcov -c -d ${BIN_DIR} -o ${COV_FILE} --rc lcov_branch_coverage=1 log_and_run genhtml --branch-coverage -o ${COV_HTML_DIR} ${COV_FILE} |