diff options
Diffstat (limited to 'tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp')
-rw-r--r-- | tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp index 8a315af850..5e9b7370b9 100644 --- a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp +++ b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp @@ -63,9 +63,7 @@ private slots: void autoDelete(); void adoptedThreads(); void ensureCleanupOrder(); -#ifndef QT_NO_PROCESS void crashOnExit(); -#endif void leakInDestructor(); void resetInDestructor(); void valueBased(); @@ -85,6 +83,7 @@ int Pointer::count = 0; void tst_QThreadStorage::initTestCase() { +#ifndef QT_NO_PROCESS const QString crashOnExitDir = QFINDTESTDATA("crashonexit"); QVERIFY2(!crashOnExitDir.isEmpty(), qPrintable(QString::fromLatin1("Could not find 'crashonexit' starting from '%1'") @@ -95,6 +94,7 @@ void tst_QThreadStorage::initTestCase() #endif QVERIFY2(QFileInfo(m_crashOnExit).isExecutable(), qPrintable(QDir::toNativeSeparators(m_crashOnExit) + QStringLiteral(" does not exist or is not executable."))); +#endif } void tst_QThreadStorage::hasLocalData() @@ -320,14 +320,18 @@ static inline bool runCrashOnExit(const QString &binary, QString *errorMessage) } return true; } +#endif void tst_QThreadStorage::crashOnExit() { +#ifdef QT_NO_PROCESS + QSKIP("No qprocess support", SkipAll); +#else QString errorMessage; QVERIFY2(runCrashOnExit(m_crashOnExit, &errorMessage), qPrintable(errorMessage)); -} #endif +} // S stands for thread Safe. class SPointer |