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

[I Ahmad]

Enabled the make check and fixed the failing tests.

[Timo Jyrinki (timo-jyrinki)]

Looks good https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-daily/+sourcepub/3741274/+listing-archive-extra

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-16 10:44:35 +0000
+++ debian/changelog	2013-12-18 09:37:51 +0000
@@ -1,10 +1,14 @@
 qtscript-opensource-src (5.2.0+dfsg-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Timo Jyrinki ]
   * Sync with Debian, no remaining differences.
   * New upstream release. 
   * Bump dependencies to 5.2.0
 
- -- Timo Jyrinki <[e-mail]>  Mon, 02 Sep 2013 12:40:58 +0000
+  [ Iftikhar Ahmad (QA Engineer) ]
+  * Enable make check and fix the failing tests.
+
+ -- Iftikhar Ahmad (QA Engineer) <[e-mail]>  Wed, 18 Dec 2013 13:51:29 +0500
 
 qtscript-opensource-src (5.1.0+dfsg-3) unstable; urgency=low
 
 
=== modified file 'debian/control'
--- debian/control	2013-11-13 14:31:16 +0000
+++ debian/control	2013-12-18 09:37:51 +0000
@@ -12,7 +12,8 @@
 Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1),
                pkg-kde-tools (>= 0.15.8~),
-               qtbase5-private-dev (>= 5.2.0~)
+               qtbase5-private-dev (>= 5.2.0~),
+               xvfb
 Build-Depends-Indep: libqt5sql5-sqlite,
                      qttools5-dev-tools (>= 5.2.0~)
 Standards-Version: 3.9.4
 
=== 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-18 09:37:51 +0000
@@ -0,0 +1,11 @@
+--- a/tests/auto/qscriptextensionplugin/test/test.pro
++++ b/tests/auto/qscriptextensionplugin/test/test.pro
+@@ -14,7 +14,7 @@ CONFIG(debug_and_release) {
+     DESTDIR = ../release
+   }
+ } else {
+-  DESTDIR = ..
++  DESTDIR = .
+ }
+ 
+ DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-08-30 06:48:51 +0000
+++ debian/patches/series	2013-12-18 09:37:51 +0000
@@ -1,2 +1,3 @@
+enable-make-check.patch
 disable_v8_sunspider_tests.patch
 s390x_jscore.diff
 
=== modified file 'debian/rules'
--- debian/rules	2013-12-16 10:42:06 +0000
+++ debian/rules	2013-12-18 09:37:51 +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=qtscript5-dbg
@@ -35,3 +36,6 @@
 prune-nonfree:
 	rm -rf tests/benchmarks/script/sunspider/*
 	rm -rf tests/benchmarks/script/v8/*
+
+override_dh_auto_test:
+	cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && xvfb-run make -f Makefile check