diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2021-02-11 10:51:55 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-13 10:14:16 +0000 |
| commit | 83dcbf75ad232421070fbe1b461c54b5ffe9783d (patch) | |
| tree | 1279dade2c2e94277bc34e1557b40786a180ad52 /tests/auto/other | |
| parent | 1c0073ba72f92ba96db05230d1c8e896cc85c821 (diff) | |
Move QEMU emulation detector to QTest
The emulation detection has been usable only on qtbase tests, move it to
QTest so that it can be used in other modules as well.
Change-Id: I4b2321b7856414d7b1cfd5e6b1405a633c6bb878
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 0ce443691fac1188103e5eaa66be40278d5d5e97)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests/auto/other')
| -rw-r--r-- | tests/auto/other/qobjectrace/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/auto/other/qobjectrace/tst_qobjectrace.cpp | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/tests/auto/other/qobjectrace/CMakeLists.txt b/tests/auto/other/qobjectrace/CMakeLists.txt index 8069b40ad7..7a2be39d81 100644 --- a/tests/auto/other/qobjectrace/CMakeLists.txt +++ b/tests/auto/other/qobjectrace/CMakeLists.txt @@ -6,8 +6,7 @@ qt_internal_add_test(qobjectrace SOURCES - ../../../shared/emulationdetector.h tst_qobjectrace.cpp - INCLUDE_DIRECTORIES - ../../../shared + PUBLIC_LIBRARIES + Qt::TestPrivate ) diff --git a/tests/auto/other/qobjectrace/tst_qobjectrace.cpp b/tests/auto/other/qobjectrace/tst_qobjectrace.cpp index cdf51f5d0c..ac33fa3ec3 100644 --- a/tests/auto/other/qobjectrace/tst_qobjectrace.cpp +++ b/tests/auto/other/qobjectrace/tst_qobjectrace.cpp @@ -30,7 +30,7 @@ #include <QtCore> #include <QTest> -#include "emulationdetector.h" +#include <QtTest/private/qemulationdetector_p.h> enum { OneMinute = 60 * 1000, TwoMinutes = OneMinute * 2 }; @@ -260,7 +260,7 @@ public: void tst_QObjectRace::destroyRace() { - if (EmulationDetector::isRunningArmOnX86()) + if (QTestPrivate::isRunningArmOnX86()) QSKIP("Test is too slow to run on emulator"); enum { ThreadCount = 10, ObjectCountPerThread = 2777, |