Get coverage working for the cmake build

Change-Id: Icab8bf64fae2beafbb97bcb50824d29afd01e981

diff --git a/automated-tests/coverage.sh b/automated-tests/coverage.sh
index a4cad67..96c3740 100755 (executable)
--- a/automated-tests/coverage.sh
+++ b/automated-tests/coverage.sh
@@ -5,7 +5,18 @@ if [ $1 == -n ] ; then
   opt_genhtml=false
 fi
 
-( cd ../build/tizen ; make cov_data )
+BUILD_DIR_NAME=tizen
+function MakeCovData()
+{
+    (  cd ../build/$BUILD_DIR_NAME ; make cov_data )
+}
+
+MakeCovData
+if [[ $? -ne 0 ]]
+then
+    BUILD_DIR_NAME=tizen-cmake
+    MakeCovData
+fi
 
 # From lcov version 1.10 onwards, branch coverage is off by default and earlier versions do not support the rc option
 LCOV_OPTS=`if [ \`printf "\\\`lcov --version | cut -d' ' -f4\\\`\n1.10\n" | sort -V | head -n 1\` = 1.10 ] ; then echo "--rc lcov_branch_coverage=1" ; fi`
@@ -30,7 +41,7 @@ done
 (
     if [ $opt_genhtml == true ] ; then
         cd .. ;
-        genhtml $LCOV_OPTS -o build/tizen/doc/coverage `find . -name dali.info`
-        echo "Coverage output: ../build/tizen/doc/coverage/index.html"
+        genhtml $LCOV_OPTS -o build/$BUILD_DIR_NAME/doc/coverage `find . -name dali.info`
+        echo "Coverage output: ../build/$BUILD_DIR_NAME/doc/coverage/index.html"
     fi
 )

diff --git a/automated-tests/execute.sh b/automated-tests/execute.sh
index 902ba11..7703340 100755 (executable)
--- a/automated-tests/execute.sh
+++ b/automated-tests/execute.sh
@@ -77,9 +77,8 @@ fi
 rm -f tct*core-tests.xml
 
 # Clean up old coverage data
-if [ -d ../build/tizen ] ; then
-    rm -f ../build/tizen/dali/.libs/*.gcda
-fi
+[ -d ../build/tizen ] && rm -f ../build/tizen/dali/.libs/*.gcda
+[ -d ../build/tizen-cmake ] && find ../build/tizen-cmake/ -name \*.gcda -exec rm {} \;
 
 find build \( -name "*.gcda" \) -exec rm '{}' \;
 

diff --git a/build/tizen-cmake/.gitignore b/build/tizen-cmake/.gitignore
new file mode 100644 (file)
index 0000000..5df5866
--- /dev/null
+++ b/build/tizen-cmake/.gitignore
@@ -0,0 +1 @@
+/doc

diff --git a/build/tizen-cmake/CMakeLists.txt b/build/tizen-cmake/CMakeLists.txt
index ab90d54..408f967 100644 (file)
--- a/build/tizen-cmake/CMakeLists.txt
+++ b/build/tizen-cmake/CMakeLists.txt
@@ -88,12 +88,6 @@ ADD_COMPILE_OPTIONS( -std=c++11 -gdwarf-4 )
 ADD_COMPILE_OPTIONS( -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast )
 ADD_COMPILE_OPTIONS( -Werror -Wall -Wextra -Wno-unused-parameter -Wfloat-equal )
 
-IF( ENABLE_DEBUG )
-  ADD_COMPILE_OPTIONS( -O0 )
-ELSE( ENABLE_DEBUG )
-  ADD_COMPILE_OPTIONS( -Os )
-ENDIF( ENABLE_DEBUG )
-
 IF( ENABLE_COVERAGE OR $ENV{CXXFLAGS} MATCHES --coverage )
   ADD_COMPILE_OPTIONS( --coverage )
   SET(ENABLE_COVERAGE ON)
@@ -217,3 +211,5 @@ MESSAGE( STATUS "Debug build:           " ${ENABLE_DEBUG} )
 MESSAGE( STATUS "Backtrace:             " ${ENABLE_BACKTRACE} )
 MESSAGE( STATUS "Scoped Lock backtrace: " ${ENABLE_LOCK_BACKTRACE} )
 MESSAGE( STATUS "Coverage:              " ${ENABLE_COVERAGE} )
+MESSAGE( STATUS "CXXFLAGS:              " ${CMAKE_CXX_FLAGS} )
+MESSAGE( STATUS "LDFLAGS:               " ${CMAKE_SHARED_LINKER_FLAGS_INIT}${CMAKE_SHARED_LINKER_FLAGS} )