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

Change-Id: I044f617e5898ed19e7468625853617efe9b54799

diff --git a/automated-tests/.gitignore b/automated-tests/.gitignore
index 94db43f6e4232c032beeaecc6b3694e9db61c5c8..34dc85b2474f3d9b31eac372f1329441e65f4b18 100644 (file)
--- a/automated-tests/.gitignore
+++ b/automated-tests/.gitignore
@@ -2,4 +2,4 @@
 build
 build.log
 tct*core.h
-rules.mk
\ No newline at end of file
+results_xml.*
\ No newline at end of file

diff --git a/automated-tests/coverage.sh b/automated-tests/coverage.sh
index 678dea7a383740837dac8143b0deea14bcf10908..c5fbed7bbe3092300edb65f3cf9172f47bac27a1 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 "*boost*" "/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 37cabf6489dcd432e0ae43379f7dc421c06bbda1..c1d466d037e8a72f80c3dbcdf4153df376666b1d 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 d740d96c2c24107ab8a341e60112e794d741ef5a..1aa98f02548323ca341aba036a4671a05f362fc6 100644 (file)
--- a/build/tizen/Makefile.am
+++ b/build/tizen/Makefile.am
@@ -52,7 +52,7 @@ cov_data:
        @for i in `find $(COVERAGE_DIR) -name "libdali_adaptor_la-*.gcda" -o -name "libdali_adaptor_la-*.gcno"` ;\
                do mv $$i `echo $$i | sed s/libdali_adaptor_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*" "dali-env/*" "/usr/include/*" -o dali.info
+       @cd $(COVERAGE_DIR) ; lcov $(LCOV_OPTS) --remove dali.info "*/dali-env/*" "/usr/include/*" -o dali.info
        @test -z $(COVERAGE_OUTPUT_DIR) || mkdir -p $(COVERAGE_OUTPUT_DIR)
 
 coverage: cov_data