diff options
author | Pasi Petäjäjärvi <pasi.petajajarvi@digia.com> | 2013-01-16 14:34:35 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-23 10:38:59 +0100 |
commit | 416e73a0fcaf31f7c32ba7dcd214b62e6060123c (patch) | |
tree | 1be730c488c0f979a5ab1ffb40631489a5a9c94b /tests/auto/corelib/thread | |
parent | 2d2da44f6381fdeaa195319c0dc66e3909c2ca7b (diff) |
Check existence of QProcess feature before using it on Qt autotests.
VxWorks does not have QProcess support.
Change-Id: I20ed479125097d468a1aa50afb18c3749f0fbb98
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'tests/auto/corelib/thread')
-rw-r--r-- | tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp index 7854339e4c..a64ba11eae 100644 --- a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp +++ b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp @@ -71,7 +71,9 @@ private slots: void autoDelete(); void adoptedThreads(); void ensureCleanupOrder(); +#ifndef QT_NO_PROCESS void crashOnExit(); +#endif void leakInDestructor(); void resetInDestructor(); void valueBased(); @@ -305,6 +307,7 @@ void tst_QThreadStorage::ensureCleanupOrder() QVERIFY(First::order < Second::order); } +#ifndef QT_NO_PROCESS static inline bool runCrashOnExit(const QString &binary, QString *errorMessage) { const int timeout = 60000; @@ -332,6 +335,7 @@ void tst_QThreadStorage::crashOnExit() QVERIFY2(runCrashOnExit(m_crashOnExit, &errorMessage), qPrintable(errorMessage)); } +#endif // S stands for thread Safe. class SPointer |