summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-04-16 08:34:35 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-04-16 11:33:30 (GMT)
commit36de36e5695744e3c5d7dc839011b7b593737be5 (patch)
treec8838284516b7f7a3e5e8848c35eefafadb58458 /tests
parent14e5bf2963cc48e48b1a9c4c3650df8162d59c09 (diff)
downloadQt-36de36e5695744e3c5d7dc839011b7b593737be5.zip
Qt-36de36e5695744e3c5d7dc839011b7b593737be5.tar.gz
Qt-36de36e5695744e3c5d7dc839011b7b593737be5.tar.bz2
Finish renaming
Diffstat (limited to 'tests')
-rw-r--r--tests/manual/network_stresstest/network_stresstest.pro (renamed from tests/manual/network_stresstest/qtcpsocket_stresstest.pro)2
-rw-r--r--tests/manual/network_stresstest/tst_network_stresstest.cpp (renamed from tests/manual/network_stresstest/tst_qtcpsocket_stresstest.cpp)9
2 files changed, 4 insertions, 7 deletions
diff --git a/tests/manual/network_stresstest/qtcpsocket_stresstest.pro b/tests/manual/network_stresstest/network_stresstest.pro
index 47b2682..0e272d1 100644
--- a/tests/manual/network_stresstest/qtcpsocket_stresstest.pro
+++ b/tests/manual/network_stresstest/network_stresstest.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
QT = core network
-SOURCES += tst_qtcpsocket_stresstest.cpp \
+SOURCES += tst_network_stresstest.cpp \
minihttpserver.cpp
HEADERS += \
diff --git a/tests/manual/network_stresstest/tst_qtcpsocket_stresstest.cpp b/tests/manual/network_stresstest/tst_network_stresstest.cpp
index 20ae9c0..7c94972 100644
--- a/tests/manual/network_stresstest/tst_qtcpsocket_stresstest.cpp
+++ b/tests/manual/network_stresstest/tst_network_stresstest.cpp
@@ -54,7 +54,7 @@
#endif
#include "minihttpserver.h"
-#include "../network-settings.h"
+#include "../../auto/network-settings.h"
#include <qplatformdefs.h>
#ifdef Q_OS_UNIX
@@ -111,7 +111,7 @@ private Q_SLOTS:
};
tst_QTcpSocket_stresstest::tst_QTcpSocket_stresstest()
- : intermediateDebug(qgetenv("QTCPSOCKET_STRESSTEST").toInt() > 1)
+ : intermediateDebug(qgetenv("STRESSDEBUG").toInt() > 0)
{
#ifdef Q_OS_WIN
WSAData wsadata;
@@ -135,9 +135,6 @@ void tst_QTcpSocket_stresstest::initTestCase_data()
void tst_QTcpSocket_stresstest::init()
{
- if (qgetenv("QTCPSOCKET_STRESSTEST").toInt() == 0)
- QSKIP("Stress test disabled", SkipAll);
-
// clear the internal cache
#ifndef QT_BUILD_INTERNAL
if (strncmp(QTest::currentTestFunction(), "nam") == 0)
@@ -736,4 +733,4 @@ void tst_QTcpSocket_stresstest::namGet()
QTEST_MAIN(tst_QTcpSocket_stresstest);
-#include "tst_qtcpsocket_stresstest.moc"
+#include "tst_network_stresstest.moc"