Merge lp:~iahmad/kubuntu-packaging/qtcreator into lp:~kubuntu-packagers/kubuntu-packaging/qtcreator

[I Ahmad]

Enabled the unit tests while building package and skipped the ones which are failing.

[Timo Jyrinki (timo-jyrinki)]

Thanks, nice to have some tests for QtC! I'll try landing this after u-series opens.

[Dmitry Shachnev (mitya57)]

Thanks for your work! My comments:

- Please build-depend on xauth. Xvfb only recommends xauth, while it is needed for running the tests.
- Please use dh_auto_test instead of make check. This way the tests will be properly skipped when DEB_BUILD_OPTIONS contains nocheck. See other Qt modules for example of how to do that.
- Instead of "cp -r $(CURDIR)/builddir/lib/*/ $(CURDIR)/lib", you can simply export LD_LIBRARY_PATH or QT_PLUGIN_PATH. Again, see other Qt modules.
- There is something weird with the version number in debian/changelog.

review: Needs Fixing

[I Ahmad (iahmad)]

Thanks for your comments Dmitry, I ll try fixing them but the one about
export LD_LIBRARY_PATH didn't work for me and that's why I adopted this
work around. Could you please try it locally and let me know if it works
for you. So far I tried exporting as well as setting it inline but none of
them work.

Cheers

On Tue, Apr 15, 2014 at 12:51 PM, Dmitry Shachnev <email address hidden> wrote:

> Review: Needs Fixing
>
> Thanks for your work! My comments:
>
> - Please build-depend on xauth. Xvfb only recommends xauth, while it is
> needed for running the tests.
> - Please use dh_auto_test instead of make check. This way the tests will
> be properly skipped when DEB_BUILD_OPTIONS contains nocheck. See other Qt
> modules for example of how to do that.
> - Instead of "cp -r $(CURDIR)/builddir/lib/*/ $(CURDIR)/lib", you can
> simply export LD_LIBRARY_PATH or QT_PLUGIN_PATH. Again, see other Qt
> modules.
> - There is something weird with the version number in debian/changelog.
> --
>
> https://code.launchpad.net/~iahmad/kubuntu-packaging/qtcreator/+merge/215802
> You are the owner of lp:~iahmad/kubuntu-packaging/qtcreator.
>

[Dmitry Shachnev (mitya57)]

> the one about export LD_LIBRARY_PATH didn't work for me and that's why I adopted this work around.

If you tried and it didn't work, then no problem, and the workaround looks fine.

[lp:~iahmad/kubuntu-packaging/qtcreator]

125. By I Ahmad on 2014-04-15

Fixing the changelog version and adding xauth dep as per Dmitry review comments

[I Ahmad (iahmad)]

Fixed the xauth dep and version number. dh_auto_test is and export
LD_LIBRARY_PATH are not working.

On Tue, Apr 15, 2014 at 8:51 PM, Dmitry Shachnev <email address hidden> wrote:

> > the one about export LD_LIBRARY_PATH didn't work for me and that's why I
> adopted this work around.
>
> If you tried and it didn't work, then no problem, and the workaround looks
> fine.
> --
>
> https://code.launchpad.net/~iahmad/kubuntu-packaging/qtcreator/+merge/215802
> You are the owner of lp:~iahmad/kubuntu-packaging/qtcreator.
>

[Timo Jyrinki (timo-jyrinki)]

Passes at least on x86, merging (and fixing conflicts). Great to have some tests here! It'll need to be checked how is it on armhf, powerpc, ppc64el and arm64 before publishing for real.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-15 07:23:40 +0000
+++ debian/changelog	2014-04-15 17:22:16 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 qtcreator (3.0.1-0ubuntu4) trusty; urgency=medium
 
   [ Zeller Benjamin ]
@@ -5,6 +6,15 @@
 
  -- Zoltán Balogh <[e-mail]>  Wed, 09 Apr 2014 11:23:44 +0300
 
+=======
+qtcreator (3.0.1-0ubuntu4) UNRELEASED; urgency=low
+
+  * Enable the unit tests during package build.
+  * Skip failing tests on unix. 
+
+ -- Iftikhar Ahmad (QA Engineer) <[e-mail]>  Tue, 15 Apr 2014 14:15:00 +0500
+
+>>>>>>> MERGE-SOURCE
 qtcreator (3.0.1-0ubuntu3) trusty; urgency=medium
 
   * Rebuild against Qt Webkit 5.1.1
 
=== modified file 'debian/control'
--- debian/control	2014-04-15 07:23:40 +0000
+++ debian/control	2014-04-15 17:22:16 +0000
@@ -40,6 +40,8 @@
                qttools5-dev-tools (>= 5.2.0~),
                qttools5-private-dev (>= 5.2.0~),
                qtxmlpatterns5-dev-tools (>= 5.2.0~),
+               xauth,
+               xvfb,
 Standards-Version: 3.9.3
 Homepage: http://qt-project.org/
 Vcs-Browser: http://git.debian.org/?p=collab-maint/qt-creator.git
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2014-04-15 07:23:40 +0000
+++ debian/patches/series	2014-04-15 17:22:16 +0000
@@ -1,4 +1,5 @@
 # Debian patches
+skip_failing_unit_tests.diff
 02_use_x-terminal-emulator.diff
 botan_system_lib.diff
 no-Werror.diff
 
=== added file 'debian/patches/skip_failing_unit_tests.diff'
--- debian/patches/skip_failing_unit_tests.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/skip_failing_unit_tests.diff	2014-04-15 17:22:16 +0000
@@ -0,0 +1,28 @@
+Index: qtcreator/tests/auto/auto.pro
+===================================================================
+--- qtcreator.orig/tests/auto/auto.pro	2014-04-08 10:18:58.684264000 +0000
++++ qtcreator/tests/auto/auto.pro	2014-04-08 10:20:30.671316474 +0000
+@@ -4,9 +4,7 @@
+     aggregation \
+     changeset \
+     cplusplus \
+-    debugger \
+     diff \
+-    extensionsystem \
+     environment \
+     generichighlighter \
+     profilewriter \
+@@ -15,8 +13,11 @@
+     qtcprocess \
+     utils \
+     utils_stringutils \
+-    filesearch \
+-    valgrind
++    filesearch
++
++!unix:SUBDIRS += debugger
++!unix:SUBDIRS += extensionsystem
++!unix:SUBDIRS += valgrind
+ 
+ #contains (QT_CONFIG, declarative) {
+ #SUBDIRS += qml
 
=== modified file 'debian/rules'
--- debian/rules	2014-04-15 07:23:40 +0000
+++ debian/rules	2014-04-15 17:22:16 +0000
@@ -21,6 +21,7 @@
 export QMAKE_LFLAGS_RELEASE := $(LDFLAGS)
 export QMAKE_LFLAGS_DEBUG := $(LDFLAGS)
 export QT_SELECT := qt5
+export QT_QPA_PLATFORM := minimal
 
 # Upstream changelog
 upstream_changes := $(wildcard dist/changes-*)
@@ -65,3 +66,8 @@
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
+
+override_dh_auto_test:
+	cp -r $(CURDIR)/builddir/lib/*/ $(CURDIR)/lib
+	cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && xvfb-run -a make -f Makefile check
+