(AutomatedTests) Synchronise with core & remove boost & installed headers for coverage

Change-Id: Ic8608ce96c706f9a0401204749ed61cf51556abd

diff --git a/automated-tests/.gitignore b/automated-tests/.gitignore
index f039d8a..39d9377 100644 (file)
--- a/automated-tests/.gitignore
+++ b/automated-tests/.gitignore
@@ -2,3 +2,4 @@
 build
 build.log
 tct*core.h
+results_xml.*

diff --git a/automated-tests/coverage.sh b/automated-tests/coverage.sh
index ad7d29b..c5fbed7 100755 (executable)
--- a/automated-tests/coverage.sh
+++ b/automated-tests/coverage.sh
@@ -13,7 +13,11 @@ for i in `find . -name "*.dir"` ; do
         if [[ $? -eq 0 ]]
         then
             lcov $LCOV_OPTS --directory . -c -o dali.info
-            lcov $LCOV_OPTS --remove dali.info "/usr/include/*" "*/automated-tests/*" -o dali.info
+            lcov $LCOV_OPTS --remove dali.info "/usr/include/*" "*/automated-tests/*" "*/dali-env/*" -o dali.info
+            if [ ! -s dali.info ]
+            then
+              rm -f dali.info
+            fi
         fi
     )
 done

diff --git a/automated-tests/scripts/retriever.sh b/automated-tests/scripts/retriever.sh
index 37cabf6..c1d466d 100755 (executable)
--- a/automated-tests/scripts/retriever.sh
+++ b/automated-tests/scripts/retriever.sh
@@ -182,9 +182,9 @@ elif [[ $# == 2 && -f $DIR/$2 ]] ; then
     FILE=$2
 fi
 
-#Debug needs to be output on stderr ( calling script redirects stdout to file )
 #echo "Dir: $DIR  File: $FILE" >& 2
 
+
 # populate $TC_FILES with files declared in CMakeLists.txt
 if [[ -z $FILE ]]; then
     get_tc_files $DIR

diff --git a/build/tizen/Makefile.am b/build/tizen/Makefile.am
index f633e75..e116401 100644 (file)
--- a/build/tizen/Makefile.am
+++ b/build/tizen/Makefile.am
@@ -55,7 +55,7 @@ cov_data:
        @for i in `find $(COVERAGE_DIR) -name "libdali_toolkit_la-*.gcda" -o -name "libdali_toolkit_la-*.gcno"` ;\
                do mv $$i `echo $$i | sed s/libdali_toolkit_la-//` ; echo $$i ; done
        @cd $(COVERAGE_DIR) ; lcov $(LCOV_OPTS) --base-directory . --directory . -c -o dali.info
-       @cd $(COVERAGE_DIR) ; lcov $(LCOV_OPTS) --remove dali.info "*boost*" "/usr/include/*" "*/dali-env/*" -o dali.info
+       @cd $(COVERAGE_DIR) ; lcov $(LCOV_OPTS) --remove dali.info "/usr/include/*" "*/dali-env/*" -o dali.info
        @test -z $(COVERAGE_OUTPUT_DIR) || mkdir -p $(COVERAGE_OUTPUT_DIR)
 
 coverage: cov_data