diff options
author | Kari Oikarinen <kari.oikarinen@qt.io> | 2018-04-17 15:12:02 +0300 |
---|---|---|
committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2018-05-14 12:36:33 +0000 |
commit | 2fc274ddb50171b1ef9f7220848aa135a78b5bdb (patch) | |
tree | 763acd9159757f7d211350ed5d750362f7f66de1 /tests/auto/corelib/io/qprocess | |
parent | bb6ba17019b596049de3ffd31a79f75f597e7f41 (diff) |
Skip tst_QProcess::processesInMultipleThreads under QEMU
tst_QProcess hangs sometimes in QEMU. Based on my experiments in a debug VM the
offending test seems to be processesInMultipleThreads(), since that was were I
was able to reproduce the hanging in.
Since the whole test executable hangs, blacklisting is not enough, so skip the
test.
Task-number: QTBUG-67760
Change-Id: I34f8852be955a8612deac22b369f68d79a139d11
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/corelib/io/qprocess')
-rw-r--r-- | tests/auto/corelib/io/qprocess/test/test.pro | 2 | ||||
-rw-r--r-- | tests/auto/corelib/io/qprocess/tst_qprocess.cpp | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/corelib/io/qprocess/test/test.pro b/tests/auto/corelib/io/qprocess/test/test.pro index 7d6a7973dc..63187c9668 100644 --- a/tests/auto/corelib/io/qprocess/test/test.pro +++ b/tests/auto/corelib/io/qprocess/test/test.pro @@ -2,6 +2,8 @@ CONFIG += testcase CONFIG -= debug_and_release_target QT = core-private testlib network SOURCES = ../tst_qprocess.cpp +INCLUDEPATH += ../../../../../shared +HEADERS += ../../../../../shared/emulationdetector.h TARGET = ../tst_qprocess diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp index 6b4d292fe3..e19653abf0 100644 --- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp +++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp @@ -27,6 +27,7 @@ ** ****************************************************************************/ +#include <emulationdetector.h> #include <QtTest/QtTest> #include <QtCore/QProcess> @@ -1165,6 +1166,8 @@ void tst_QProcess::processInAThread() void tst_QProcess::processesInMultipleThreads() { + if (EmulationDetector::isRunningArmOnX86()) + QSKIP("Flakily hangs in QEMU. QTBUG-67760"); for (int i = 0; i < 10; ++i) { // run from 1 to 10 threads, but run at least some tests // with more threads than the ideal |