summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/access/http2
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2021-02-11 10:51:55 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2021-02-13 10:02:51 +0200
commit0ce443691fac1188103e5eaa66be40278d5d5e97 (patch)
treec3ab6b2ce3a667cabecec57222e1d624122144a7 /tests/auto/network/access/http2
parent9585500539b3674296c61b884fe3f12363efb848 (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. Pick-to: 6.1 Change-Id: I4b2321b7856414d7b1cfd5e6b1405a633c6bb878 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests/auto/network/access/http2')
-rw-r--r--tests/auto/network/access/http2/CMakeLists.txt4
-rw-r--r--tests/auto/network/access/http2/tst_http2.cpp4
2 files changed, 3 insertions, 5 deletions
diff --git a/tests/auto/network/access/http2/CMakeLists.txt b/tests/auto/network/access/http2/CMakeLists.txt
index 7ac1c8001c..735f95deff 100644
--- a/tests/auto/network/access/http2/CMakeLists.txt
+++ b/tests/auto/network/access/http2/CMakeLists.txt
@@ -6,15 +6,13 @@
qt_internal_add_test(tst_http2
SOURCES
- ../../../../shared/emulationdetector.h
http2srv.cpp http2srv.h
tst_http2.cpp
DEFINES
SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
- INCLUDE_DIRECTORIES
- ../../../../shared
PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Network
Qt::NetworkPrivate
+ Qt::TestPrivate
)
diff --git a/tests/auto/network/access/http2/tst_http2.cpp b/tests/auto/network/access/http2/tst_http2.cpp
index d4ef1520a7..1aa012c6ac 100644
--- a/tests/auto/network/access/http2/tst_http2.cpp
+++ b/tests/auto/network/access/http2/tst_http2.cpp
@@ -55,7 +55,7 @@
#include <memory>
#include <string>
-#include "emulationdetector.h"
+#include <QtTest/private/qemulationdetector_p.h>
#if (!defined(QT_NO_OPENSSL) && OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_TLSEXT)) \
|| QT_CONFIG(schannel)
@@ -379,7 +379,7 @@ void tst_Http2::flowControlServerSide()
// to let all replies finish without any error.
using namespace Http2;
- if (EmulationDetector::isRunningArmOnX86())
+ if (QTestPrivate::isRunningArmOnX86())
QSKIP("Test is too slow to run on emulator");
clearHTTP2State();