diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-14 16:22:03 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-16 11:31:41 (GMT) |
| commit | 212febae195d5842d62087ac24c43fb2db979393 (patch) | |
| tree | 8b35bf46d43057c16f0a98425bec71bbe61294e1 | |
| parent | d7a2c6b051f08b71f439e8fa91ff5316fbdd4be1 (diff) | |
| download | Qt-212febae195d5842d62087ac24c43fb2db979393.zip Qt-212febae195d5842d62087ac24c43fb2db979393.tar.gz Qt-212febae195d5842d62087ac24c43fb2db979393.tar.bz2 | |
Add the test to the testsuite, but disabled
| -rw-r--r-- | tests/auto/network.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qtcpsocket_stresstest/tst_qtcpsocket_stresstest.cpp | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/tests/auto/network.pro b/tests/auto/network.pro index 4f205fe..7aa4313 100644 --- a/tests/auto/network.pro +++ b/tests/auto/network.pro @@ -34,6 +34,8 @@ SUBDIRS=\ qsslerror \ qsslkey \ qsslsocket \ + qtcpsocket_stresstest \ + contains(QT_CONFIG, private_tests): SUBDIRS -= \ qhttpnetworkconnection \ diff --git a/tests/auto/qtcpsocket_stresstest/tst_qtcpsocket_stresstest.cpp b/tests/auto/qtcpsocket_stresstest/tst_qtcpsocket_stresstest.cpp index a4d5096..d8c71e6 100644 --- a/tests/auto/qtcpsocket_stresstest/tst_qtcpsocket_stresstest.cpp +++ b/tests/auto/qtcpsocket_stresstest/tst_qtcpsocket_stresstest.cpp @@ -58,6 +58,7 @@ public: public slots: void initTestCase_data(); + void init(); void slotReadAll() { static_cast<QTcpSocket *>(sender())->readAll(); } @@ -84,6 +85,12 @@ void tst_QTcpSocket_stresstest::initTestCase_data() QTest::newRow("remote") << true << QtNetworkSettings::serverName() << 80; } +void tst_QTcpSocket_stresstest::init() +{ + if (qgetenv("QTCPSOCKET_STRESSTEST").toInt() == 0) + QSKIP("Stress test disabled", SkipAll); +} + void tst_QTcpSocket_stresstest::blockingConnectDisconnect() { QFETCH_GLOBAL(QString, hostname); |