Merge lp:~om26er/phablet-extras/unittests_coverage into lp:~phablet-team/phablet-extras/qtmultimedia-touch

[Omer Akram]

Run unit tests during build, add code coverage target for CI

Run unit tests during build, add code coverage target for CI

[lp:~om26er/phablet-extras/unittests_coverage]

90. By Omer Akram on 2013-12-09

build with coverage enabled

Unmerged revisions

90. By Omer Akram on 2013-12-09

build with coverage enabled

89. By Omer Akram on 2013-12-09

add coverage target

88. By Omer Akram on 2013-12-09

disable unreliable unittests

87. By Omer Akram on 2013-12-09

run unittests during build

=== added file 'debian/patches/enable_coverage.patch'
--- debian/patches/enable_coverage.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/enable_coverage.patch	2013-12-09 18:09:44 +0000
@@ -0,0 +1,87 @@
+=== added file 'coverage.pri'
+--- a/coverage.pri	1970-01-01 00:00:00 +0000
++++ b/coverage.pri	2013-12-05 13:19:46 +0000
+@@ -0,0 +1,44 @@
++# Coverage
++CONFIG(coverage) {
++    LIBS += -lgcov
++    QMAKE_CXXFLAGS += --coverage
++    QMAKE_LDFLAGS += --coverage
++
++    QMAKE_EXTRA_TARGETS += clean-gcno clean-gcda coverage-html \
++        generate-coverage-html clean-coverage-html coverage-gcovr \
++        generate-gcovr generate-coverage-gcovr clean-coverage-gcovr
++
++    clean-gcno.commands = \
++        "@echo Removing old coverage instrumentation"; \
++        "find -name '*.gcno' -print | xargs -r rm"
++
++    clean-gcda.commands = \
++        "@echo Removing old coverage results"; \
++        "find -name '*.gcda' -print | xargs -r rm"
++  
++    coverage-html.depends = clean-gcda check generate-coverage-html
++  
++    generate-coverage-html.commands = \
++        "@echo Collecting coverage data"; \
++        "lcov --directory $${TOP_SRC_DIR} --capture --output-file coverage.info --no-checksum --compat-libtool"; \
++        "lcov --extract coverage.info \"*/src/*.cpp\" -o coverage.info"; \
++        "lcov --remove coverage.info \"moc_*.cpp\" -o coverage.info"; \
++        "LANG=C genhtml --prefix $${TOP_SRC_DIR} --output-directory coverage-html --title \"Code Coverage\" --legend --show-details coverage.info"
++  
++    clean-coverage-html.depends = clean-gcda
++    clean-coverage-html.commands = \
++        "lcov --directory $${TOP_SRC_DIR} -z"; \
++        "rm -rf coverage.info coverage-html"
++
++    coverage-gcovr.depends = clean-gcda check generate-coverage-gcovr
++
++    generate-coverage-gcovr.commands = \
++        "@echo Generating coverage GCOVR report"; \
++        "gcovr -x -r $${TOP_SRC_DIR} -o $${TOP_SRC_DIR}/coverage.xml -e \".*/moc_.*\" -e \"tests/.*\" -e \".*\\.h\""
++
++    clean-coverage-gcovr.depends = clean-gcda
++    clean-coverage-gcovr.commands = \
++        "rm -rf $${TOP_SRC_DIR}/coverage.xml"
++
++    QMAKE_CLEAN += *.gcda *.gcno coverage.info coverage.xml
++}
+
+=== modified file 'qtmultimedia.pro'
+--- a/qtmultimedia.pro	2013-09-20 19:21:01 +0000
++++ b/qtmultimedia.pro	2013-12-05 14:04:53 +0000
+@@ -36,3 +36,4 @@
+ 
+ load(qt_parts)
+ 
++include( coverage.pri )
+
+=== modified file 'src/multimedia/multimedia.pro'
+--- a/src/multimedia/multimedia.pro	2013-09-20 19:21:01 +0000
++++ b/src/multimedia/multimedia.pro	2013-12-05 14:04:53 +0000
+@@ -69,3 +69,5 @@
+ win32:LIBS += -luuid
+ 
+ HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
++
++include( ../../coverage.pri )
+
+=== modified file 'src/multimediawidgets/multimediawidgets.pro'
+--- a/src/multimediawidgets/multimediawidgets.pro	2013-09-20 19:21:01 +0000
++++ b/src/multimediawidgets/multimediawidgets.pro	2013-12-05 14:04:53 +0000
+@@ -54,3 +54,5 @@
+ }
+ 
+ HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
++
++include( ../../coverage.pri )
+
+=== modified file 'src/src.pro'
+--- a/src/src.pro	2013-09-20 19:21:01 +0000
++++ b/src/src.pro	2013-12-05 14:04:53 +0000
+@@ -45,3 +45,4 @@
+ 
+ SUBDIRS += src_plugins
+ 
++include( ../coverage.pri )
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-10-02 23:44:09 +0000
+++ debian/patches/series	2013-12-09 18:09:44 +0000
@@ -1,1 +1,3 @@
 add_quick_to_qgsttools.patch
+skip_failing_tests.patch
+enable_coverage.patch

=== added file 'debian/patches/skip_failing_tests.patch'
--- debian/patches/skip_failing_tests.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/skip_failing_tests.patch	2013-12-09 18:09:44 +0000
@@ -0,0 +1,20 @@
+=== modified file 'tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp'
+--- a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp	2013-09-20 19:21:01 +0000
++++ b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp	2013-12-05 16:30:52 +0000
+@@ -341,6 +341,7 @@
+ 
+ void tst_QMediaPlaylist::saveAndLoad()
+ {
++    QSKIP("QTBUG-23826: Is flaky and has been like that for a while");
+     QMediaPlaylist playlist;
+     playlist.addMedia(content1);
+     playlist.addMedia(content2);
+@@ -649,6 +650,7 @@
+ 
+ void tst_QMediaPlaylist::testLoaded_signal()
+ {
++    QSKIP("QTBUG-35420 Is falky and fails at random");
+     //create an instance of QMediaPlaylist class.
+     QMediaPlaylist playlist;
+     playlist.addMedia(content1); //set the media to playlist
+

=== modified file 'debian/rules'
--- debian/rules	2013-11-25 14:42:05 +0000
+++ debian/rules	2013-12-09 18:09:44 +0000
@@ -16,6 +16,7 @@
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
+export QT_QPA_PLATFORM := minimal
 
 get-packaged-orig-source:
 	rm -rf $(PKG_source)-$(UPS_version)
@@ -56,7 +57,7 @@
 		debian/libqt5multimedia5-touch-plugins.preinst
 	sed "s/__ARCH__/$(DEB_HOST_MULTIARCH)/g" -i \
 		debian/libqt5multimedia5-touch-plugins.postrm
-	qmake CONFIG+=mir
+	qmake CONFIG+=mir CONFIG+=coverage
 
 override_dh_auto_install-arch:
 	dh_auto_install
@@ -74,3 +75,6 @@
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
+override_dh_auto_test:
+	export LD_LIBRARY_PATH=$(CURDIR)/lib
+	cd tests/auto/unit/ && ( test -e Makefile || qmake unit.pro -o Makefile ) && make -f Makefile check