[SCM] qbs packaging branch, experimental, updated. debian/1.4.1+dfsg-3-3-ge9a0a1b

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qbs.git;a=commitdiff;h=e9a0a1b

The following commit has been merged in the experimental branch:
commit e9a0a1b0d633c8acb8ed3e6492ef598085c0ad5b
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Jul 12 17:02:30 2015 +0300

    Disable one more test failing because of QtScript bugs.
---
 debian/changelog                                     |  3 +++
 ...hpp_included.diff => disable_tests_qtscript.diff} | 20 ++++++++++++++++----
 debian/patches/series                                |  2 +-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f85c54d..e435919 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ qbs (1.4.1+dfsg-4) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Add missing includes for kinfo_getproc(3) on kFreeBSD
     (bsd_includes.diff).
+  * Disable one more test (infinite-loop-js) failing because of QtScript
+    bugs to make the build pass on powerpc. Rename the patch from
+    disable_moc_hpp_included.diff to disable_tests_qtscript.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 12 Jul 2015 16:31:57 +0300
 
diff --git a/debian/patches/disable_moc_hpp_included.diff b/debian/patches/disable_tests_qtscript.diff
similarity index 77%
rename from debian/patches/disable_moc_hpp_included.diff
rename to debian/patches/disable_tests_qtscript.diff
index 4ddc93a..d3ce17e 100644
--- a/debian/patches/disable_moc_hpp_included.diff
+++ b/debian/patches/disable_tests_qtscript.diff
@@ -1,4 +1,4 @@
-Description: remove a test that fails because of QtScript bug
+Description: remove some tests that fail because of QtScript bugs
  The stacktrace is (obtained on ppc64el):
    #0  SLL_PopRange (end=<synthetic pointer>, start=<synthetic pointer>, N=<optimized out>, head=0x3fffb32004e0) at ../3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp:742
    #1  PopRange (end=<synthetic pointer>, start=<synthetic pointer>, N=<optimized out>, this=0x3fffb32004e0) at ../3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp:2083
@@ -9,11 +9,15 @@ Description: remove a test that fails because of QtScript bug
    #6  0x00003fffb6a489b8 in start_thread (arg=0x3fffb441f160) at pthread_create.c:322
    #7  0x00003fffb745f870 in clone () at ../sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S:104
  .
- QBS is going to be ported away from QtScript, but in the mean time remove this test
- so it does not block the build.
+ QBS is going to be ported away from QtScript, but in the mean time remove
+ some tests to make the build pass.
+ .
+ Currently disabled tests:
+   moc-hpp-included (fails on powerpc, ppc64el, mipsel)
+   infinite-loop-js (fails on powerpc)
 Author: Dmitry Shachnev <mitya57 at debian.org>
 Forwarded: not-needed
-Last-Update: 2015-07-11
+Last-Update: 2015-07-12
 
 --- a/tests/auto/api/tst_api.cpp
 +++ b/tests/auto/api/tst_api.cpp
@@ -27,3 +31,11 @@ Last-Update: 2015-07-11
      QTest::newRow("app and lib with same source file")
              << QString("lib-same-source")
              << relativeExecutableFilePath("HelloWorldApp");
+@@ -951,7 +948,6 @@
+ void TestApi::infiniteLoopBuilding_data()
+ {
+     QTest::addColumn<QString>("projectDirName");
+-    QTest::newRow("JS Command") << QString("infinite-loop-js");
+     QTest::newRow("Process Command") << QString("infinite-loop-process");
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index f9968df..c216b68 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,5 @@ skip_test.diff
 remove_rpaths.diff
 revert_tests_speedup.diff
 fix_assembly_test.diff
-disable_moc_hpp_included.diff
+disable_tests_qtscript.diff
 bsd_includes.diff

-- 
qbs packaging