diff options
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qlocalsocket/tst_qlocalsocket.cpp | 6 | ||||
| -rw-r--r-- | tests/auto/qsslsocket/tst_qsslsocket.cpp | 30 | ||||
| -rw-r--r-- | tests/auto/qtcpsocket/tst_qtcpsocket.cpp | 3 |
3 files changed, 26 insertions, 13 deletions
diff --git a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp index c289c24..50ac953 100644 --- a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp @@ -716,12 +716,18 @@ void tst_QLocalSocket::threadedConnection() QFETCH(int, threads); Server server; +#if defined(Q_OS_SYMBIAN) + server.setStackSize(0x14000); +#endif server.clients = threads; server.start(); QList<Client*> clients; for (int i = 0; i < threads; ++i) { clients.append(new Client()); +#if defined(Q_OS_SYMBIAN) + clients.last()->setStackSize(0x14000); +#endif clients.last()->start(); } diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp index b62d629..8dfbedd 100644 --- a/tests/auto/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp @@ -509,22 +509,28 @@ void tst_QSslSocket::sslErrors_data() QTest::addColumn<SslErrorList>("errors"); #if defined(Q_OS_SYMBIAN) - QTest::newRow("aspiriniks.troll.no") << QtNetworkSettings::serverName() << 443 + + QTest::newRow(QtNetworkSettings::serverName().toAscii() + " port443") << QtNetworkSettings::serverName() << 443 << (SslErrorList() << QSslError::SelfSignedCertificate -#if !defined(Q_CC_NOKIAX86) - << QSslError::CertificateNotYetValid -#endif //!defined(Q_CC_NOKIAX86) ); - QTest::newRow("aspiriniks.troll.no") << QtNetworkSettings::serverName() << 993 + QTest::newRow(QtNetworkSettings::serverName().toAscii() + " port993") << QtNetworkSettings::serverName() << 993 << (SslErrorList() << QSslError::HostNameMismatch - << QSslError::SelfSignedCertificate - -#if !defined(Q_CC_NOKIAX86) - << QSslError::CertificateNotYetValid -#endif //!defined(Q_CC_NOKIAX86) - ); + << QSslError::SelfSignedCertificate + ); + // TODO: Should we have QtNetworkSettings::serverName alias + // in order that we could test with different host name + +#else + QTest::newRow("imap.troll.no") << "imap.troll.no" << 993 + << (SslErrorList() + << QSslError::HostNameMismatch + << QSslError::SelfSignedCertificateInChain); + QTest::newRow("imap.trolltech.com") << "imap.trolltech.com" << 993 + << (SslErrorList() + << QSslError::SelfSignedCertificateInChain); + #endif //Q_OS_SYMBIAN } @@ -1039,7 +1045,7 @@ void tst_QSslSocket::wildcard() // returns the CNAME fluke.troll.no for this domain. The web server // responds with the wildcard, and QSslSocket should accept that as a // valid connection. This was broken in 4.3.0. - QSslSocketPtr socket = newSocket();; + QSslSocketPtr socket = newSocket(); socket->addCaCertificates(QLatin1String("certs/aspiriniks.ca.crt")); this->socket = socket; #ifdef QSSLSOCKET_CERTUNTRUSTED_WORKAROUND diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp index 9d75fba..2e039bf 100644 --- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp @@ -81,7 +81,8 @@ #ifndef TEST_QNETWORK_PROXY //#define TEST_QNETWORK_PROXY #endif -#ifdef TEST_QNETWORK_PROXY +#if defined(TEST_QNETWORK_PROXY) || defined (Q_CC_RVCT) +// RVCT compiles also unused inline methods # include <QNetworkProxy> #endif |