[Test] Some fixes for code coverage

diff --git a/CMakeLists.txt b/CMakeLists.txt
index db0c0e41a34474564fde1d72026b06edaefb241a..4c09a6977788882eaf808a72ffe246eb71238594 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -826,8 +826,8 @@ ENDIF(NOT CMAKE_C_OPT_FLAGS)
 
 IF(ENABLE_COVERAGE)
        SET(CMAKE_C_OPT_FLAGS "-g -O0 -fno-strict-aliasing")
-       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --coverage -fprofile-arcs -ftest-coverage")
-       SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage -fprofile-arcs -ftest-coverage")
+       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --coverage")
+       SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage")
 ENDIF(ENABLE_COVERAGE)
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_OPT_FLAGS} ${CMAKE_C_FLAGS} ${CMAKE_C_WARN_FLAGS}")

diff --git a/circle.yml b/circle.yml
index f7a85c31a2a6675799f5d2c965e300e4d7c144e7..234ba0bca745ec3cf2520439157cbbd8a89a5fbf 100644 (file)
--- a/circle.yml
+++ b/circle.yml
@@ -11,6 +11,7 @@ test:
     - cmake --build . --target install
     - sudo robot test/functional/cases
     - lcov --no-external -b . -d . -c --output-file coverage.info
+    - lcov -r coverage.info *.rl
     - ln -s src/ragel .
     - if [ ! -z $COVERALLS_REPO_TOKEN ]; then coveralls-lcov -t ${COVERALLS_REPO_TOKEN} coverage.info; fi
   post: