diff options
| author | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2018-06-13 16:35:40 +0300 |
|---|---|---|
| committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2018-11-26 07:06:59 +0000 |
| commit | 71bd06d516a2410ae0ea698e79dcb94aba9bc5b4 (patch) | |
| tree | 75ca3d56d9a02711bf20325a1507b157d5eb79c7 /tests/auto/network/access/http2 | |
| parent | d8b401959f6f58bc80f767684b250dd4589735d6 (diff) | |
Make developer build tests pass for boot2qt
Some tests were fixed and others were skipped/blacklisted.
Task-number: QTBUG-63152
Change-Id: Ica7df555f8d152ee589865911130525101d4b941
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'tests/auto/network/access/http2')
| -rw-r--r-- | tests/auto/network/access/http2/http2.pro | 3 | ||||
| -rw-r--r-- | tests/auto/network/access/http2/tst_http2.cpp | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tests/auto/network/access/http2/http2.pro b/tests/auto/network/access/http2/http2.pro index e130f30784..b244a827bd 100644 --- a/tests/auto/network/access/http2/http2.pro +++ b/tests/auto/network/access/http2/http2.pro @@ -2,7 +2,8 @@ QT += core core-private network network-private testlib CONFIG += testcase parallel_test c++11 TARGET = tst_http2 -HEADERS += http2srv.h +INCLUDEPATH += ../../../../shared/ +HEADERS += http2srv.h ../../../../shared/emulationdetector.h SOURCES += tst_http2.cpp http2srv.cpp DEFINES += SRCDIR=\\\"$$PWD/\\\" diff --git a/tests/auto/network/access/http2/tst_http2.cpp b/tests/auto/network/access/http2/tst_http2.cpp index ecf4c5814a..51e30804a3 100644 --- a/tests/auto/network/access/http2/tst_http2.cpp +++ b/tests/auto/network/access/http2/tst_http2.cpp @@ -48,6 +48,8 @@ #include <cstdlib> #include <string> +#include "emulationdetector.h" + #if !defined(QT_NO_OPENSSL) && OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_TLSEXT) // HTTP/2 over TLS requires ALPN/NPN to negotiate the protocol version. const bool clearTextHTTP2 = false; @@ -292,6 +294,9 @@ void tst_Http2::flowControlServerSide() // to let all replies finish without any error. using namespace Http2; + if (EmulationDetector::isRunningArmOnX86()) + QSKIP("Test is too slow to run on emulator"); + clearHTTP2State(); serverPort = 0; |