Merge lp:~timo-jyrinki/ubuntu/trusty/maliit-framework/fix_tests_under_qt52 into lp:ubuntu/trusty/maliit-framework

[Timo Jyrinki]

Modify xvfb command to successfully pass tests (LP: #1272249)

Built at:
https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-beta2/+sourcepub/3845860/+listing-archive-extra

[lp:~timo-jyrinki/ubuntu/trusty/maliit-framework/fix_tests_under_qt52]

11. By Dmitry Shachnev on 2014-01-24

[ Timo Jyrinki ]
Remove hard-coded dependency on libqt5core5 (LP: #1270720).

12. By Timo Jyrinki on 2014-01-24

Modify xvfb command to successfully pass tests (LP: #1272249)

[Timo Jyrinki (timo-jyrinki)]

Rebased and added changelog entry.

[Jamie Strandboge (jdstrand)]

Changing from the default of '-screen 0 640x480x8' to '-screen 0 640x480x24' seems reasonable, but it would have been nice to have a more detailed changelog entry (ie, why this is needed). Won't block on this. ACK. Will upload after a successful local build.

review: Approve

[Jamie Strandboge (jdstrand)]

Thanks for the patch! :)

[Jamie Strandboge (jdstrand)]

With 5.0 (what is in the archive now), there are no regressions.

$ debian/rules run-tests | grep Totals
Totals: 3 passed, 0 failed, 0 skipped
Totals: 3 passed, 0 failed, 0 skipped
Totals: 3 passed, 0 failed, 0 skipped
Totals: 2 passed, 0 failed, 1 skipped
Totals: 8 passed, 0 failed, 0 skipped
Totals: 5 passed, 0 failed, 0 skipped
Totals: 3 passed, 0 failed, 0 skipped
Totals: 9 passed, 0 failed, 0 skipped
Totals: 26 passed, 0 failed, 0 skipped
Totals: 5 passed, 0 failed, 0 skipped
Totals: 9 passed, 0 failed, 0 skipped

I didn't test this with 5.2 and will trust it works there (if it doesn't, we are no worse off than now).

Thanks again!

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-24 14:54:42 +0000
+++ debian/changelog	2014-01-24 13:51:22 +0000
@@ -1,3 +1,9 @@
+maliit-framework (0.99.0+git20130615+97e8335-0ubuntu5) trusty; urgency=medium
+
+  * Modify xvfb command to successfully pass tests (LP: #1272249)
+
+ -- Timo Jyrinki <[e-mail]>  Fri, 24 Jan 2014 13:49:59 +0000
+
 maliit-framework (0.99.0+git20130615+97e8335-0ubuntu4) trusty; urgency=medium
 
   [ Timo Jyrinki ]

=== modified file 'debian/rules'
--- debian/rules	2013-07-25 09:45:13 +0000
+++ debian/rules	2014-01-24 13:51:22 +0000
@@ -37,7 +37,7 @@
 	rm -rf $(PKG_source)-$(UPS_version)
 
 run-tests:
-	xvfb-run -a $(MAKE) check
+	xvfb-run -s '-screen 0 640x480x24' -a $(MAKE) check
 
 DEB_MAKE_CHECK_TARGET := -f debian/rules run-tests