diff options
Diffstat (limited to 'tests/auto/corelib/thread')
| -rw-r--r-- | tests/auto/corelib/thread/qthread/qthread.pro | 3 | ||||
| -rw-r--r-- | tests/auto/corelib/thread/qthread/tst_qthread.cpp | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/corelib/thread/qthread/qthread.pro b/tests/auto/corelib/thread/qthread/qthread.pro index 381f6c9e45..37552f1fca 100644 --- a/tests/auto/corelib/thread/qthread/qthread.pro +++ b/tests/auto/corelib/thread/qthread/qthread.pro @@ -4,3 +4,6 @@ QT = core testlib SOURCES = tst_qthread.cpp qtConfig(c++14):CONFIG += c++14 qtConfig(c++1z):CONFIG += c++1z + +INCLUDEPATH += ../../../../shared/ +HEADERS += ../../../../shared/emulationdetector.h diff --git a/tests/auto/corelib/thread/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp index b107cf4b60..27a617ec85 100644 --- a/tests/auto/corelib/thread/qthread/tst_qthread.cpp +++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp @@ -51,6 +51,8 @@ #include <exception> #endif +#include "emulationdetector.h" + class tst_QThread : public QObject { Q_OBJECT @@ -943,6 +945,9 @@ void tst_QThread::adoptMultipleThreadsOverlap() // Disconnects on WinCE void tst_QThread::stressTest() { + if (EmulationDetector::isRunningArmOnX86()) + QSKIP("Qemu uses too much memory for each thread. Test would run out of memory."); + QTime t; t.start(); while (t.elapsed() < one_minute) { |