I Ahmad has proposed merging lp:~iahmad/kubuntu-packaging/qtcreator into
lp:~kubuntu-packagers/kubuntu-packaging/qtcreator.
Requested reviews:
Kubuntu Packagers (kubuntu-packagers)
For more details, see:
https://code.launchpad.net/~iahmad/kubuntu-packaging/qtcreator/+merge/214721
--
https://code.launchpad.net/~iahmad/kubuntu-packaging/qtcreator/+merge/214721
Your team Kubuntu Packagers is requested to review the proposed merge of
lp:~iahmad/kubuntu-packaging/qtcreator into
lp:~kubuntu-packagers/kubuntu-packaging/qtcreator.
=== modified file 'debian/changelog'
--- debian/changelog 2014-04-01 10:02:32 +0000
+++ debian/changelog 2014-04-08 11:14:21 +0000
@@ -1,3 +1,10 @@
+qtcreator (3.0.1-0ubuntu6) UNRELEASED; urgency=low
+
+ * Enable the unit tests during package build.
+ * Skip failing tests on unix.
+
+ -- Iftikhar Ahmad (QA Engineer) <ubuntu@trusty4> Tue, 08 Apr 2014 10:24:45 +0000
+
qtcreator (3.0.1-0ubuntu3) trusty; urgency=medium
* Rebuild against Qt Webkit 5.1.1
=== modified file 'debian/control'
--- debian/control 2014-04-01 10:02:32 +0000
+++ debian/control 2014-04-08 11:14:21 +0000
@@ -40,6 +40,7 @@
qttools5-dev-tools (>= 5.2.0~),
qttools5-private-dev (>= 5.2.0~),
qtxmlpatterns5-dev-tools (>= 5.2.0~),
+ 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-03-06 10:25:09 +0000
+++ debian/patches/series 2014-04-08 11:14:21 +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-08 11:14:21 +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-03-07 06:32:17 +0000
+++ debian/rules 2014-04-08 11:14:21 +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,7 @@
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
+
=== modified file 'tests/auto/auto.pro'
--- tests/auto/auto.pro 2013-11-15 12:25:23 +0000
+++ tests/auto/auto.pro 2014-04-08 11:14:21 +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
--
kubuntu-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
