[neon/qt/qbs/Neon/release] debian: Update disable_tests_qtscript.diff for CMake port.

[Dmitry Shachnev]

Git commit 67250787b933962cee6552987b6a237ff222d05c by Dmitry Shachnev.
Committed on 05/04/2022 at 21:18.
Pushed by jriddell into branch 'Neon/release'.

Update disable_tests_qtscript.diff for CMake port.

M  +1    -0    debian/changelog
M  +14   -21   debian/patches/disable_tests_qtscript.diff

https://invent.kde.org/neon/qt/qbs/commit/67250787b933962cee6552987b6a237ff222d05c

diff --git a/debian/changelog b/debian/changelog
index 7615167..6b004c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qbs (1.22.0-2) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Update debian/libqbscore1.22.symbols from buildds’ logs.
+  * Update disable_tests_qtscript.diff for CMake port.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 06 Apr 2022 00:00:33 +0300
 
diff --git a/debian/patches/disable_tests_qtscript.diff b/debian/patches/disable_tests_qtscript.diff
index 35651f9..36e2ae8 100644
--- a/debian/patches/disable_tests_qtscript.diff
+++ b/debian/patches/disable_tests_qtscript.diff
@@ -1,5 +1,5 @@
-Description: limit API tests to only common architectures
- On other architectures they are segfaulting due to bugs in QtScript.
+Description: disable API tests on powerpc, ppc64 and ppc64el
+ They are segfaulting due to bugs in QtScript.
  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,25 +9,18 @@ Description: limit API tests to only common architectures
    #5  0x00003fffb6a48604 in __nptl_deallocate_tsd () at pthread_create.c:157
    #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 disable
- API tests on non-common architectures to make the build pass.
 Author: Dmitry Shachnev <mitya57 at debian.org>
 Forwarded: not-needed
-Last-Update: 2019-04-18
+Last-Update: 2022-04-06
 
---- a/tests/auto/auto.pro
-+++ b/tests/auto/auto.pro
-@@ -17,5 +17,10 @@ SUBDIRS += \
-     blackbox/blackbox-examples.pro \
-     blackbox/blackbox-java.pro \
-     blackbox/blackbox-joblimits.pro \
--    blackbox/blackbox-qt.pro \
--    api
-+    blackbox/blackbox-qt.pro
-+
-+equals(QT_ARCH, i386) | equals(QT_ARCH, x86_64) | \
-+equals(QT_ARCH, arm) | equals(QT_ARCH, arm64) | \
-+equals(QT_ARCH, s390x) {
-+    SUBDIRS += api
-+}
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -1,4 +1,7 @@
+-add_subdirectory(api)
++set(POWERPC_ARCHITECTURES ppc ppc64 ppc64le)
++if(NOT CMAKE_HOST_SYSTEM_PROCESSOR IN_LIST POWERPC_ARCHITECTURES)
++    add_subdirectory(api)
++endif()
+ add_subdirectory(cmdlineparser)
+ add_subdirectory(blackbox)
+