Skip to content

Commit 06e8860

Browse files
committed
[WS2_32_APITEST] Try to make the number of WSAAsync tests constant.
1 parent 085528c commit 06e8860

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

modules/rostests/apitests/ws2_32/WSAAsync.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,10 @@ START_TEST(WSAAsync)
121121
{
122122
dwWait = WaitForMultipleObjects(2, fEvents, FALSE, WAIT_TIMEOUT_);
123123

124-
ok(dwWait == WAIT_OBJECT_0 || // server socket event
125-
dwWait == WAIT_OBJECT_0+1, // client socket event
126-
"Unknown event received %ld\n", dwWait);
127-
if (dwWait != WAIT_OBJECT_0 && dwWait != WAIT_OBJECT_0+1)
124+
if (dwWait != WAIT_OBJECT_0 && // server socket event
125+
dwWait != WAIT_OBJECT_0+1) // client socket event
128126
{
127+
ok(0, "Unknown event received %ld\n", dwWait);
129128
skip("ERROR: Connection timeout\n");
130129
break;
131130
}
@@ -227,9 +226,12 @@ START_TEST(WSAAsync)
227226
}
228227
else
229228
{
230-
ok(nSockNameRes == 0, "ERROR: getsockname function failed, expected %d error %d\n", 0, nSockNameRes);
231-
ok(len == sizeof(addr_con_loc), "ERROR: getsockname function wrong size, expected %d returned %d\n", sizeof(addr_con_loc), len);
232-
ok(addr_con_loc.sin_addr.s_addr == server_addr_in.sin_addr.s_addr, "ERROR: getsockname function wrong addr, expected %lx returned %lx\n", server_addr_in.sin_addr.s_addr, addr_con_loc.sin_addr.s_addr);
229+
if (nSockNameRes != 0)
230+
ok(0, "ERROR: getsockname function failed, expected %d error %d\n", 0, nSockNameRes);
231+
if (len != sizeof(addr_con_loc))
232+
ok(0, "ERROR: getsockname function wrong size, expected %d returned %d\n", sizeof(addr_con_loc), len);
233+
if (addr_con_loc.sin_addr.s_addr != server_addr_in.sin_addr.s_addr)
234+
ok(0, "ERROR: getsockname function wrong addr, expected %lx returned %lx\n", server_addr_in.sin_addr.s_addr, addr_con_loc.sin_addr.s_addr);
233235
}
234236
if ((dwFlags & FD_ACCEPT) != 0)
235237
{// client connected

0 commit comments

Comments
 (0)