Merge lp:~iahmad/kubuntu-packaging/enable-unit-tests into lp:~kubuntu-packagers/kubuntu-packaging/qtsensors-opensource-src

[I Ahmad]

[Dmitry Shachnev (mitya57)]

- xvfb-run -a dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
+ cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && xvfb-run -a make -f Makefile check

Any reason why you did that?

That dh_auto_test was there for purpose, i.e. it will make sure tests are skipped when building with DEB_BUILD_OPTIONS=nocheck.

I think the previous command should work fine here.

P.S. Also, the failing tests should be fixed, not skipped :)

[Dmitry Shachnev (mitya57)]

review: Abstain

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-10 07:24:37 +0000
+++ debian/changelog	2013-12-10 12:50:09 +0000
@@ -1,10 +1,14 @@
-qtsensors-opensource-src (5.2.0~rc1+dfsg-0ubuntu1) UNRELEASED; urgency=low
+qtsensors-opensource-src (5.2.0~rc1+dfsg-0ubuntu2) UNRELEASED; urgency=low
 
+  [ Timo Jyrinki ]
   * New upstream version
   * Reduce delta to Debian by dropping private headers too
   * Re-enable tests
 
- -- Timo Jyrinki <[e-mail]>  Tue, 03 Dec 2013 10:33:09 +0000
+  [ Iftikhar Ahmad (QA Engineer) ]
+  * Enabled the unit tests and skipped the failing ones.
+
+ -- Iftikhar Ahmad (QA Engineer) <[e-mail]>  Tue, 10 Dec 2013 17:01:20 +0500
 
 qtsensors-opensource-src (5.1.1+dfsg-2ubuntu2) trusty; urgency=low
 

=== added directory 'debian/patches'
=== added file 'debian/patches/enable-make-check.patch'
--- debian/patches/enable-make-check.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/enable-make-check.patch	2013-12-10 12:50:09 +0000
@@ -0,0 +1,13 @@
+--- a/tests/auto/auto.pro
++++ b/tests/auto/auto.pro
+@@ -5,8 +5,8 @@ SUBDIRS += sensors2qmlapi
+ #SUBDIRS += legacy_sensors
+ SUBDIRS += qtsensors5
+ SUBDIRS += qsensorgestures
+-SUBDIRS += qsensorgestureplugins
++!unix:SUBDIRS += qsensorgestureplugins
+ SUBDIRS += cmake
+ 
+-!mac:!win32:SUBDIRS += qsensorgestures_gestures
++!mac:!win32:!unix:SUBDIRS += qsensorgestures_gestures
+ 

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2013-12-10 12:50:09 +0000
@@ -0,0 +1,1 @@
+enable-make-check.patch

=== modified file 'debian/rules'
--- debian/rules	2013-12-10 06:58:33 +0000
+++ debian/rules	2013-12-10 12:50:09 +0000
@@ -7,6 +7,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
 
 %:
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtsensors5-dbg
@@ -14,9 +15,6 @@
 override_dh_auto_configure:
 	qmake "CONFIG+=debug" QT_BUILD_PARTS+=tests
 
-override_dh_auto_test:
-	xvfb-run -a dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
-
 override_dh_auto_install:
 	dh_auto_install
 	
@@ -39,6 +37,9 @@
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
+override_dh_auto_test:
+	cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && xvfb-run -a make -f Makefile check
+
 prune-nonfree:
 	# Remove minified jquery without source.
 	rm -fv doc/config/scripts/jquery.js