Tests: initialize WinSock to v2.2
Change-Id: I3f2652e6a7ce39cbc85fe7381d2a871609c8350c Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
This commit is contained in:
parent
f6ccbaa7ab
commit
1372764ead
@ -517,7 +517,7 @@ void tst_QTcpServer::setSocketDescriptor()
|
|||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
// ensure winsock is started
|
// ensure winsock is started
|
||||||
WSADATA wsaData;
|
WSADATA wsaData;
|
||||||
QVERIFY(WSAStartup(MAKEWORD(2,0), &wsaData) == NO_ERROR);
|
QVERIFY(WSAStartup(MAKEWORD(2, 2), &wsaData) == NO_ERROR);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
SOCKET sock = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
|
SOCKET sock = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
|
||||||
|
@ -75,7 +75,7 @@ tst_NetworkRemoteStressTest::tst_NetworkRemoteStressTest()
|
|||||||
WSAData wsadata;
|
WSAData wsadata;
|
||||||
|
|
||||||
// IPv6 requires Winsock v2.0 or better.
|
// IPv6 requires Winsock v2.0 or better.
|
||||||
WSAStartup(MAKEWORD(2,0), &wsadata);
|
WSAStartup(MAKEWORD(2, 2), &wsadata);
|
||||||
#elif defined(Q_OS_UNIX)
|
#elif defined(Q_OS_UNIX)
|
||||||
::signal(SIGALRM, SIG_IGN);
|
::signal(SIGALRM, SIG_IGN);
|
||||||
#endif
|
#endif
|
||||||
|
@ -82,7 +82,7 @@ tst_NetworkStressTest::tst_NetworkStressTest()
|
|||||||
WSAData wsadata;
|
WSAData wsadata;
|
||||||
|
|
||||||
// IPv6 requires Winsock v2.0 or better.
|
// IPv6 requires Winsock v2.0 or better.
|
||||||
WSAStartup(MAKEWORD(2,0), &wsadata);
|
WSAStartup(MAKEWORD(2, 2), &wsadata);
|
||||||
#elif defined(Q_OS_UNIX)
|
#elif defined(Q_OS_UNIX)
|
||||||
::signal(SIGALRM, SIG_IGN);
|
::signal(SIGALRM, SIG_IGN);
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user