[Opensync-commits] r1032 - trunk/tests

[<svn...@op...>]

Author: bellmich
Date: Mon Apr  6 13:33:08 2009
New Revision: 1032
URL: http://libsyncml.opensync.org/changeset/1032

Log:
fixed coverage building after understanding "ctest -T test -T coverage -R ."

Modified:
   trunk/tests/coverage.sh.cmake

Modified: trunk/tests/coverage.sh.cmake
==============================================================================
--- trunk/tests/coverage.sh.cmake	Fri Apr  3 21:39:52 2009	(r1031)
+++ trunk/tests/coverage.sh.cmake	Mon Apr  6 13:33:08 2009	(r1032)
@@ -13,8 +13,8 @@
 fi	
 echo $TITLE
 
-if ! [ -d coverage/html ]; then
-	mkdir -p coverage/html
+if ! [ -d ${CMAKE_BINARY_DIR}/coverage/html ]; then
+	mkdir -p ${CMAKE_BINARY_DIR}/coverage/html
 fi
 
 ## compile tests
@@ -26,31 +26,32 @@
 ## create gcda files
 RESULT=`find ${CMAKE_CURRENT_BINARY_DIR} -name "*.gcda" -print | wc -l`
 if [ "$RESULT" == "0" ]; then
-	ctest -R "^error$"
+	ctest -R .
 fi
 
 ## analyze statistics
 lcov \
 	--test-name "$TITLE" \
 	--base-directory ${CMAKE_SOURCE_DIR} \
-	--directory ${CMAKE_CURRENT_BINARY_DIR} \
+	--directory ${CMAKE_BINARY_DIR} \
 	--quiet \
 	--capture \
-	--output-file coverage/$TITLE.info
-genhtml --legend -t "$TITLE" -o coverage/html/$TITLE coverage/$TITLE.info &> /dev/null
+	--output-file ${CMAKE_BINARY_DIR}/coverage/$TITLE.info
+genhtml --legend -t "$TITLE" -o ${CMAKE_BINARY_DIR}/coverage/html/$TITLE ${CMAKE_BINARY_DIR}/coverage/$TITLE.info &> /dev/null
 
-cd coverage/html/
-ln -sf $TITLE LATEST
-cd ../../
+cd ${CMAKE_BINARY_DIR}/coverage/html/
+if [ -e LATEST ]; then rm -f LATEST; fi
+ln -s $TITLE LATEST
+cd ${CMAKE_BINARY_DIR}
 
 ## cleanup gcda files
-lcov \
-	--test-name "$TITLE" \
-	--base-directory ${CMAKE_SOURCE_DIR} \
-	--directory ${CMAKE_BINARY_DIR} \
-	--quiet \
-	--zerocounters \
-	--output-file coverage/$TITLE.info
+#lcov \
+#	--test-name "$TITLE" \
+#	--base-directory ${CMAKE_SOURCE_DIR} \
+#	--directory ${CMAKE_BINARY_DIR} \
+#	--quiet \
+#	--zerocounters \
+#	--output-file coverage/$TITLE.info
 
 echo -n "Code Coverage is: "
 grep " %</td>" coverage/html/$TITLE/index.html | sed -e "s/^[^>]*>//g" -e "s/<[^>]*>//g"