[neon/qt/qbs/Neon/release] debian: Disable api and blackbox tests on mipsel, blackbox on riscv64.

[Dmitry Shachnev]

Git commit 217ecd8684a065aa77b6d7cc109f7a603216f10e by Dmitry Shachnev.
Committed on 06/04/2022 at 16:41.
Pushed by jriddell into branch 'Neon/release'.

Disable api and blackbox tests on mipsel, blackbox on riscv64.

M  +2    -0    debian/changelog
M  +14   -5    debian/patches/disable_tests_qtscript.diff

https://invent.kde.org/neon/qt/qbs/commit/217ecd8684a065aa77b6d7cc109f7a603216f10e

diff --git a/debian/changelog b/debian/changelog
index 60c3ee3..11737ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qbs (1.22.0-3) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Disable api and blackbox tests on mipsel, blackbox on riscv64.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 06 Apr 2022 19:37:27 +0300
 
diff --git a/debian/patches/disable_tests_qtscript.diff b/debian/patches/disable_tests_qtscript.diff
index 36e2ae8..b87128c 100644
--- a/debian/patches/disable_tests_qtscript.diff
+++ b/debian/patches/disable_tests_qtscript.diff
@@ -1,4 +1,4 @@
-Description: disable API tests on powerpc, ppc64 and ppc64el
+Description: disable API tests on mipsel, 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
@@ -9,18 +9,27 @@ Description: disable API tests on powerpc, ppc64 and ppc64el
    #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
+ .
+ Also disable blackbox tests on mipsel and riscv64.
 Author: Dmitry Shachnev <mitya57 at debian.org>
 Forwarded: not-needed
 Last-Update: 2022-04-06
 
 --- a/tests/auto/CMakeLists.txt
 +++ b/tests/auto/CMakeLists.txt
-@@ -1,4 +1,7 @@
+@@ -1,6 +1,13 @@
 -add_subdirectory(api)
-+set(POWERPC_ARCHITECTURES ppc ppc64 ppc64le)
-+if(NOT CMAKE_HOST_SYSTEM_PROCESSOR IN_LIST POWERPC_ARCHITECTURES)
++set(API_DISABLED_ARCHITECTURES mips ppc ppc64 ppc64le)
++set(BLACKBOX_DISABLED_ARCHITECTURES mips riscv64)
++
++if(NOT CMAKE_HOST_SYSTEM_PROCESSOR IN_LIST API_DISABLED_ARCHITECTURES)
 +    add_subdirectory(api)
 +endif()
  add_subdirectory(cmdlineparser)
- add_subdirectory(blackbox)
+-add_subdirectory(blackbox)
++if(NOT CMAKE_HOST_SYSTEM_PROCESSOR IN_LIST BLACKBOX_DISABLED_ARCHITECTURES)
++    add_subdirectory(blackbox)
++endif()
  
+ if(WITH_UNIT_TESTS)
+     add_subdirectory(buildgraph)