From 83a587bfa639598ee6143cc5e4b3ca7951f0b91b Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Wed, 23 Mar 2022 16:09:55 +0100 Subject: 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 --- tests/auto/corelib/thread/CMakeLists.txt | 7 +------ tests/auto/corelib/thread/qthreadstorage/BLACKLIST | 3 --- tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp | 3 +++ 3 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 tests/auto/corelib/thread/qthreadstorage/BLACKLIST (limited to 'tests/auto/corelib/thread') diff --git a/tests/auto/corelib/thread/CMakeLists.txt b/tests/auto/corelib/thread/CMakeLists.txt index 2ea5d23073..356ae0346c 100644 --- a/tests/auto/corelib/thread/CMakeLists.txt +++ b/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) diff --git a/tests/auto/corelib/thread/qthreadstorage/BLACKLIST b/tests/auto/corelib/thread/qthreadstorage/BLACKLIST deleted file mode 100644 index 84906ff86e..0000000000 --- a/tests/auto/corelib/thread/qthreadstorage/BLACKLIST +++ /dev/null @@ -1,3 +0,0 @@ -# QTBUG-87431 -[crashOnExit] -android diff --git a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp index d6441217bc..893ad30161 100644 --- a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp +++ b/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 -- cgit v1.2.3