From: Andrew Lewis <nerf@judo.za.org>
Date: Wed, 10 Aug 2016 12:49:52 +0000 (+0100)
Subject: [Test] Some fixes for code coverage
X-Git-Tag: 1.3.3~35^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F833%2Fhead;p=thirdparty%2Frspamd.git

[Test] Some fixes for code coverage
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index db0c0e41a3..4c09a69777 100644
--- 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 f7a85c31a2..234ba0bca7 100644
--- 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: