Android: activate tst_QThreadStorage

Skip a test that uses QProcess instead of blacklisting it.
Re-enable this test in CMakeLists.txt, so that it can be checked
in the CI.

Fixes: QTBUG-87431
Pick-to: 6.3 6.2
Change-Id: If8a4acd60735f355dffa60c28b8d07695ee33ec8
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>

tests/auto/corelib/thread/CMakeLists.txt

@@ -22,12 +22,7 @@ if(QT_FEATURE_thread)
     # special case end
     add_subdirectory(qthreadonce)
     add_subdirectory(qthreadpool)
-    # special case begin
-    # QTBUG-87431
-    if(NOT ANDROID)
-        add_subdirectory(qthreadstorage)
-    endif()
-    # special case end
+    add_subdirectory(qthreadstorage)
     add_subdirectory(qwaitcondition)
     add_subdirectory(qwritelocker)
     if(NOT INTEGRITY)

tests/auto/corelib/thread/qthreadstorage/BLACKLIST

@@ -1,3 +0,0 @@
-# QTBUG-87431
-[crashOnExit]
-android

tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp

@@ -297,6 +297,9 @@ static inline bool runCrashOnExit(const QString &binary, QString *errorMessage)
 
 void tst_QThreadStorage::crashOnExit()
 {
+#ifdef Q_OS_ANDROID
+    QSKIP("Can't start QProcess to run a custom user binary on Android");
+#endif
 #if !QT_CONFIG(process)
     QSKIP("No qprocess support", SkipAll);
 #else