diff options
Diffstat (limited to 'tests/auto/corelib/thread')
4 files changed, 16 insertions, 10 deletions
diff --git a/tests/auto/corelib/thread/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp index aee243d880..d73dcc1b6d 100644 --- a/tests/auto/corelib/thread/qthread/tst_qthread.cpp +++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp @@ -465,8 +465,8 @@ void tst_QThread::start() void tst_QThread::terminate() { -#if defined(Q_OS_WINRT) - QSKIP("Thread termination is not supported on WinRT."); +#if defined(Q_OS_WINRT) || defined(Q_OS_ANDROID) + QSKIP("Thread termination is not supported on WinRT or Android."); #endif Terminate_Thread thread; { @@ -531,8 +531,8 @@ void tst_QThread::finished() void tst_QThread::terminated() { -#if defined(Q_OS_WINRT) - QSKIP("Thread termination is not supported on WinRT."); +#if defined(Q_OS_WINRT) || defined(Q_OS_ANDROID) + QSKIP("Thread termination is not supported on WinRT or Android."); #endif SignalRecorder recorder; Terminate_Thread thread; diff --git a/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp b/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp index 1092216fb7..838431cd5a 100644 --- a/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp +++ b/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp @@ -32,6 +32,10 @@ #include <qstring.h> #include <qmutex.h> +#ifdef Q_OS_UNIX +#include <unistd.h> +#endif + typedef void (*FunctionPointer)(); class FunctionPointerTask : public QRunnable @@ -1145,6 +1149,10 @@ void tst_QThreadPool::destroyingWaitsForTasksToFinish() // stack size used by the native thread. void tst_QThreadPool::stackSize() { +#if defined(Q_OS_UNIX) && !(defined(_POSIX_THREAD_ATTR_STACKSIZE) && (_POSIX_THREAD_ATTR_STACKSIZE-0 > 0)) + QSKIP("Setting stack size is unsupported on this platform."); +#endif + uint targetStackSize = 512 * 1024; uint threadStackSize = 1; // impossible value diff --git a/tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro b/tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro index 75898f6add..432c564ba1 100644 --- a/tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro +++ b/tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs -!winrt { +!android:!winrt { test.depends = crashonexit SUBDIRS += crashonexit } diff --git a/tests/auto/corelib/thread/qthreadstorage/test/test.pro b/tests/auto/corelib/thread/qthreadstorage/test/test.pro index 79ac2e5405..d2f21f48f0 100644 --- a/tests/auto/corelib/thread/qthreadstorage/test/test.pro +++ b/tests/auto/corelib/thread/qthreadstorage/test/test.pro @@ -2,17 +2,15 @@ CONFIG += testcase debug_and_release { CONFIG(debug, debug|release) { TARGET = ../../debug/tst_qthreadstorage - !winrt: TEST_HELPER_INSTALLS = ../../debug/crashonexit_helper + !android:!winrt: TEST_HELPER_INSTALLS = ../../debug/crashonexit_helper } else { TARGET = ../../release/tst_qthreadstorage - !winrt: TEST_HELPER_INSTALLS = ../../release/crashonexit_helper + !android:!winrt: TEST_HELPER_INSTALLS = ../../release/crashonexit_helper } } else { TARGET = ../tst_qthreadstorage - !winrt: TEST_HELPER_INSTALLS = ../crashonexit_helper + !android:!winrt: TEST_HELPER_INSTALLS = ../crashonexit_helper } CONFIG += console QT = core testlib SOURCES = ../tst_qthreadstorage.cpp - - |