The coverage script now works.

sledges · Jun 14, 2010 · fbd8539 · fbd8539
1 parent ba15faa
commit fbd8539
Show file tree

Hide file tree

Showing 48 changed files with 127 additions and 4 deletions.
diff --git a/gen-coverage.sh b/gen-coverage.sh
@@ -0,0 +1,28 @@
+#! /bin/sh
+
+LCOV=`which lcov`
+
+if test "x$LCOV" = x; then
+    echo "You need to install lcov to get actual reports!";
+    echo "See http://ltp.sf.net/coverage/lcov.php";
+    echo "!!! ATTENTION !!!"
+    echo "The current lcov-1.8 contains some silly bug.";
+    echo "Please, use a newer one or the cvs version."
+    exit 1;
+fi
+
+if test "x$SBOX_USE_CCACHE" = xyes; then
+	export SBOX_USE_CCACHE=no
+fi
+
+rm -fr ./coverage/*
+
+echo "qmake BUILD_FEATURES=coverage"
+qmake BUILD_FEATURES=coverage
+
+echo "make coverage"
+make clean
+make coverage
+
+ls -lh ./coverage/index.html
+
diff --git a/project.pro b/project.pro
@@ -1,10 +1,21 @@
 TEMPLATE = subdirs
+
 SUBDIRS = src \
-          translations \
+	  translations \
           themes \
-          demos \
+	  demos \
           tests
 
 QMAKE_CLEAN += configure-stamp build-stamp
 
+contains(BUILD_FEATURES,coverage) {
+	QMAKE_EXTRA_TARGETS += coverage
+	coverage.depends = src/Makefile 
+	coverage.commands = \
+		cd tests && make coverage && cd .. \
+                && genhtml --no-branch-coverage --legend -o coverage/ \
+		   -t \"SystemUI Coverage Report\" \
+		tests/ut_*/selected.cov
+}
+
 include(doc/doc.pri)
diff --git a/src/coverage.pri b/src/coverage.pri
@@ -0,0 +1,9 @@
+#
+# We just need an extra target so that the recursive make will pass, we don't
+# need to do anything else.
+#
+contains(BUILD_FEATURES,coverage) {
+  QMAKE_EXTRA_TARGETS += coverage
+  coverage.commands = $$system(true)
+}
+
diff --git a/src/src.pro b/src/src.pro
@@ -1,3 +1,4 @@
+include(coverage.pri)
 include(../mconfig.pri)
 
 MOC_DIR = .moc

diff --git a/tests/check.pri b/tests/check.pri
@@ -1,5 +1,5 @@
 CONFIG += link_prl
-QMAKE_EXTRA_TARGETS = check
+QMAKE_EXTRA_TARGETS += check
 check.depends = $$TARGET
 check.commands = LD_LIBRARY_PATH=../../lib ./$$TARGET
 

diff --git a/tests/coverage.pri b/tests/coverage.pri
@@ -0,0 +1,14 @@
+contains(BUILD_FEATURES,coverage) {
+	QMAKE_CXXFLAGS += --coverage 
+	QMAKE_LFLAGS += --coverage
+	QMAKE_EXTRA_TARGETS += coverage
+	coverage.commands    = \
+  		lcov --directory . --zerocounters \
+                && make check \
+                && lcov --base-directory `pwd` --directory . --capture --output-file all.cov \
+                && lcov --remove all.cov \"*debug.cpp\" --output-file tmp.cov \
+                && lcov --extract tmp.cov \"*src*.cpp\" --output-file selected.cov
+}
+
+QMAKE_CLEAN += .tmp*gcov ./.tmp/*.gcda ./.tmp/*.gcno *.cov
+
diff --git a/tests/tests.pro b/tests/tests.pro
@@ -7,7 +7,12 @@ TEMPLATE = subdirs
 # compiled but left out from the xml (or the insignificant property will be set
 # using the 'disabled' file).
 #
-SUBDIRS = $$system(ls -1d ut_*/*.pro ft_*/*.pro 2>/dev/null | sed 's!/.*!!')
+contains(BUILD_FEATURES,coverage) {
+    SUBDIRS = $$system(ls -1d ut_*/ | grep -v ut_template)
+    #SUBDIRS = $$system(ls -1d ut_*/*.pro 2>/dev/null | sed 's!/.*!!')
+} else {
+    SUBDIRS = $$system(ls -1d ut_*/*.pro ft_*/*.pro 2>/dev/null | sed 's!/.*!!')
+}
 
 QMAKE_STRIP = echo
 
@@ -21,6 +26,12 @@ QMAKE_EXTRA_TARGETS += check-xml
 
 QMAKE_CLEAN += **/*.log.xml
 
+contains(BUILD_FEATURES,coverage) {
+  QMAKE_EXTRA_TARGETS += coverage
+  coverage.target = coverage
+  coverage.CONFIG = recursive
+}
+
 support_files.commands += $$PWD/gen-tests-xml.sh > $$OUT_PWD/tests.xml
 support_files.target = support_files
 support_files.files += $$OUT_PWD/tests.xml

diff --git a/tests/ut_batterybusinesslogic/ut_batterybusinesslogic.pro b/tests/ut_batterybusinesslogic/ut_batterybusinesslogic.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_batterybusinesslogic
 

diff --git a/tests/ut_batterybusinesslogicadaptor/ut_batterybusinesslogicadaptor.pro b/tests/ut_batterybusinesslogicadaptor/ut_batterybusinesslogicadaptor.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_batterybusinesslogicadaptor
 INCLUDEPATH += $$SRCDIR

diff --git a/tests/ut_clock/ut_clock.pro b/tests/ut_clock/ut_clock.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_clock
 

diff --git a/tests/ut_clockview/ut_clockview.pro b/tests/ut_clockview/ut_clockview.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_clockview
 

diff --git a/tests/ut_dbusinterfacenotificationsource/ut_dbusinterfacenotificationsource.pro b/tests/ut_dbusinterfacenotificationsource/ut_dbusinterfacenotificationsource.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_dbusinterfacenotificationsource
 INCLUDEPATH += $$SRCDIR/notifications

diff --git a/tests/ut_eventtypestore/ut_eventtypestore.pro b/tests/ut_eventtypestore/ut_eventtypestore.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_eventtypestore
 INCLUDEPATH += $$SRCDIR/notifications

diff --git a/tests/ut_lockscreenbusinesslogic/ut_lockscreenbusinesslogic.pro b/tests/ut_lockscreenbusinesslogic/ut_lockscreenbusinesslogic.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_lockscreenbusinesslogic
 

diff --git a/tests/ut_lockscreenbusinesslogicadaptor/ut_lockscreenbusinesslogicadaptor.pro b/tests/ut_lockscreenbusinesslogicadaptor/ut_lockscreenbusinesslogicadaptor.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_lockscreenbusinesslogicadaptor
 INCLUDEPATH += $$SRCDIR

diff --git a/tests/ut_lockscreenui/ut_lockscreenui.pro b/tests/ut_lockscreenui/ut_lockscreenui.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_lockscreenui
 

diff --git a/tests/ut_lowbatterynotifier/ut_lowbatterynotifier.pro b/tests/ut_lowbatterynotifier/ut_lowbatterynotifier.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_lowbatterynotifier
 

diff --git a/tests/ut_mcompositornotificationsink/ut_mcompositornotificationsink.pro b/tests/ut_mcompositornotificationsink/ut_mcompositornotificationsink.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_mcompositornotificationsink
 INCLUDEPATH += $$SRCDIR/notifications

diff --git a/tests/ut_ngfadapter/ut_ngfadapter.pro b/tests/ut_ngfadapter/ut_ngfadapter.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_ngfadapter
 INCLUDEPATH += $$SRCDIR/notifications

diff --git a/tests/ut_ngfnotificationsink/ut_ngfnotificationsink.pro b/tests/ut_ngfnotificationsink/ut_ngfnotificationsink.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_ngfnotificationsink
 INCLUDEPATH += $$SRCDIR/notifications

diff --git a/tests/ut_notification/ut_notification.pro b/tests/ut_notification/ut_notification.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_notification
 INCLUDEPATH += $$SRCDIR/notifications

diff --git a/tests/ut_notificationarea/ut_notificationarea.pro b/tests/ut_notificationarea/ut_notificationarea.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_notificationarea
 INCLUDEPATH += $$SRCDIR/notifications $$SRCDIR/statusindicatormenu

diff --git a/tests/ut_notificationareasink/ut_notificationareasink.pro b/tests/ut_notificationareasink/ut_notificationareasink.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_notificationareasink
 INCLUDEPATH += $$SRCDIR/notifications $$SRCDIR

diff --git a/tests/ut_notificationareaview/ut_notificationareaview.pro b/tests/ut_notificationareaview/ut_notificationareaview.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_notificationareaview
 INCLUDEPATH += $$SRCDIR/notifications $$SRCDIR/statusindicatormenu

diff --git a/tests/ut_notificationgroup/ut_notificationgroup.pro b/tests/ut_notificationgroup/ut_notificationgroup.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_notificationgroup
 INCLUDEPATH += $$SRCDIR/notifications

diff --git a/tests/ut_notificationmanager/ut_notificationmanager.pro b/tests/ut_notificationmanager/ut_notificationmanager.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_notificationmanager
 INCLUDEPATH += $$SRCDIR/notifications

diff --git a/tests/ut_notificationparameter/ut_notificationparameter.pro b/tests/ut_notificationparameter/ut_notificationparameter.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_notificationparameter
 INCLUDEPATH += $$SRCDIR/notifications

diff --git a/tests/ut_notificationparameters/ut_notificationparameters.pro b/tests/ut_notificationparameters/ut_notificationparameters.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_notificationparameters
 INCLUDEPATH += $$SRCDIR/notifications

diff --git a/tests/ut_notifier/ut_notifier.pro b/tests/ut_notifier/ut_notifier.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_notifier
 INCLUDEPATH += $$SRCDIR/statusarea $$SRCDIR/notifications

diff --git a/tests/ut_notifiernotificationsink/ut_notifiernotificationsink.pro b/tests/ut_notifiernotificationsink/ut_notifiernotificationsink.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_notifiernotificationsink
 INCLUDEPATH += $$SRCDIR/notifications

diff --git a/tests/ut_pluginlist/ut_pluginlist.pro b/tests/ut_pluginlist/ut_pluginlist.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_pluginlist
 

diff --git a/tests/ut_statusarearenderer/ut_statusarearenderer.pro b/tests/ut_statusarearenderer/ut_statusarearenderer.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_statusarearenderer
 INCLUDEPATH += $$SRCDIR/statusarea

diff --git a/tests/ut_statusareaview/ut_statusareaview.pro b/tests/ut_statusareaview/ut_statusareaview.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_statusareaview
 INCLUDEPATH += $$SRCDIR/statusarea $$SRCDIR/statusindicatormenu $$SRCDIR/notifications

diff --git a/tests/ut_statusindicator/ut_statusindicator.pro b/tests/ut_statusindicator/ut_statusindicator.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_statusindicator
 

diff --git a/tests/ut_statusindicatoranimationview/ut_statusindicatoranimationview.pro b/tests/ut_statusindicatoranimationview/ut_statusindicatoranimationview.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_statusindicatoranimationview
 

diff --git a/tests/ut_statusindicatoriconview/ut_statusindicatoriconview.pro b/tests/ut_statusindicatoriconview/ut_statusindicatoriconview.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_statusindicatoriconview
 

diff --git a/tests/ut_statusindicatorlabelview/ut_statusindicatorlabelview.pro b/tests/ut_statusindicatorlabelview/ut_statusindicatorlabelview.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_statusindicatorlabelview
 

diff --git a/tests/ut_statusindicatormenuadaptor/ut_statusindicatormenuadaptor.pro b/tests/ut_statusindicatormenuadaptor/ut_statusindicatormenuadaptor.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_statusindicatormenuadaptor
 

diff --git a/tests/ut_statusindicatormenuwindow/ut_statusindicatormenuwindow.pro b/tests/ut_statusindicatormenuwindow/ut_statusindicatormenuwindow.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_statusindicatormenuwindow
 INCLUDEPATH += $$SRCDIR/statusindicatormenu $$SRCDIR/notifications

diff --git a/tests/ut_sysuid/ut_sysuid.pro b/tests/ut_sysuid/ut_sysuid.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_sysuid
 INCLUDEPATH += $$SRCDIR $$SRCDIR/notifications $$SRCDIR/statusarea

diff --git a/tests/ut_template/ut_template.pro b/tests/ut_template/ut_template.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_template
 

diff --git a/tests/ut_unlockmissedevents/ut_unlockmissedevents.pro b/tests/ut_unlockmissedevents/ut_unlockmissedevents.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 
 TARGET = ut_unlockmissedevents

diff --git a/tests/ut_unlocknotificationsink/ut_unlocknotificationsink.pro b/tests/ut_unlocknotificationsink/ut_unlocknotificationsink.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 
 TARGET = ut_unlocknotificationsink

diff --git a/tests/ut_unlockwidgets/ut_unlockwidgets.pro b/tests/ut_unlockwidgets/ut_unlockwidgets.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 
 SRC_PREFIX = ../../src

diff --git a/tests/ut_usbui/ut_usbui.pro b/tests/ut_usbui/ut_usbui.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_usbui
 INCLUDEPATH += $$SRCDIR

diff --git a/tests/ut_volumebarlogic/ut_volumebarlogic.pro b/tests/ut_volumebarlogic/ut_volumebarlogic.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_volumebarlogic
 

diff --git a/tests/ut_widgetnotificationsink/ut_widgetnotificationsink.pro b/tests/ut_widgetnotificationsink/ut_widgetnotificationsink.pro
@@ -1,3 +1,4 @@
+include(../coverage.pri)
 include(../common_top.pri)
 TARGET = ut_widgetnotificationsink
 INCLUDEPATH += $$SRCDIR/notifications

diff --git a/themes/themes.pro b/themes/themes.pro
@@ -9,6 +9,15 @@ SUBDIRS = \
 INSTALLS += \
     conf
 
+#
+# We just need an extra target so that the recursive make will pass, we don't
+# need to do anything else.
+#
+contains(BUILD_FEATURES,coverage) {
+  QMAKE_EXTRA_TARGETS += coverage
+  coverage.commands = $$system(true)
+}
+
 conf.files = \
     sysuid.conf
 conf.path = $$SYSTEMUI_THEMES_DIR