AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation of the tst_qnetworkreply benchmark test with QT_NO_SSL.

Browse Source 
preConnectEncrypted_data() is called by preConnect_data().

Change-Id: I9a3fad294d88e4cb4d2f6132cf7a87945373bb7d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Friedemann Kleint 2013-07-18 15:51:51 +02:00 committed by The Qt Project
parent 5069e203d7
commit 83ee168cbb
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
View File

@ -463,9 +463,9 @@ private slots:
#ifndef QT_NO_SSL #ifndef QT_NO_SSL
void echoPerformance_data(); void echoPerformance_data();
void echoPerformance(); void echoPerformance();
void preConnectEncrypted_data();
void preConnectEncrypted(); void preConnectEncrypted();
#endif #endif // !QT_NO_SSL
void preConnectEncrypted_data();
void downloadPerformance(); void downloadPerformance();
void uploadPerformance(); void uploadPerformance();
@ -550,13 +550,6 @@ void tst_qnetworkreply::echoPerformance()
} }
} }
void tst_qnetworkreply::preConnectEncrypted_data()
{
QTest::addColumn<int>("sleepTime");
QTest::newRow("2secs") << 2000; // to start a new request after preconnecting is done
QTest::newRow("100ms") << 100; // to start a new request while preconnecting is in-flight
}
void tst_qnetworkreply::preConnectEncrypted() void tst_qnetworkreply::preConnectEncrypted()
{ {
QString hostName = QLatin1String("www.google.com"); QString hostName = QLatin1String("www.google.com");
@ -602,7 +595,14 @@ void tst_qnetworkreply::preConnectEncrypted()
<< "ms, pre-connect request:" << preConnectElapsed << "ms, difference:" << "ms, pre-connect request:" << preConnectElapsed << "ms, difference:"
<< (normalElapsed - preConnectElapsed) << "ms"; << (normalElapsed - preConnectElapsed) << "ms";
} }
#endif #endif // !QT_NO_SSL
void tst_qnetworkreply::preConnectEncrypted_data()
{
QTest::addColumn<int>("sleepTime");
QTest::newRow("2secs") << 2000; // to start a new request after preconnecting is done
QTest::newRow("100ms") << 100; // to start a new request while preconnecting is in-flight
}
void tst_qnetworkreply::downloadPerformance() void tst_qnetworkreply::downloadPerformance()
{ {