ws2_32/tests: Skip part of OOB test to unfreeze NT4 test.
NT4 doesn't care about OOB_INLINE and receives data in the wrong recv call so the next call never receives data and hangs forever. Skip it to resume NT4 test normally.
This commit is contained in:
parent
5103291645
commit
45d64ce26b
|
@ -3741,11 +3741,14 @@ static void test_select(void)
|
||||||
tmp_buf[0] = 0xAF;
|
tmp_buf[0] = 0xAF;
|
||||||
SetLastError(0xdeadbeef);
|
SetLastError(0xdeadbeef);
|
||||||
ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), MSG_OOB);
|
ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), MSG_OOB);
|
||||||
ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); /* can't recv with MSG_OOB if OOBINLINED */
|
if (ret == SOCKET_ERROR) /* can't recv with MSG_OOB if OOBINLINED */
|
||||||
|
{
|
||||||
ok(GetLastError() == WSAEINVAL, "expected 10022, got %d\n", GetLastError());
|
ok(GetLastError() == WSAEINVAL, "expected 10022, got %d\n", GetLastError());
|
||||||
ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), 0);
|
ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), 0);
|
||||||
ok(ret == 1, "expected 1, got %d\n", ret);
|
ok(ret == 1, "expected 1, got %d\n", ret);
|
||||||
ok(tmp_buf[0] == 'A', "expected 'A', got 0x%02X\n", tmp_buf[0]);
|
ok(tmp_buf[0] == 'A', "expected 'A', got 0x%02X\n", tmp_buf[0]);
|
||||||
|
}
|
||||||
|
else ok(broken(ret == 1) /* <= NT4 */, "expected error, got 1\n");
|
||||||
|
|
||||||
/* When the connection is closed the socket is set in the read descriptor */
|
/* When the connection is closed the socket is set in the read descriptor */
|
||||||
ret = closesocket(fdRead);
|
ret = closesocket(fdRead);
|
||||||
|
@ -4724,7 +4727,8 @@ todo_wine
|
||||||
i = MSG_OOB;
|
i = MSG_OOB;
|
||||||
SetLastError(0xdeadbeef);
|
SetLastError(0xdeadbeef);
|
||||||
ret = recv(dst, &data, 1, i);
|
ret = recv(dst, &data, 1, i);
|
||||||
ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret);
|
if (ret == SOCKET_ERROR)
|
||||||
|
{
|
||||||
ret = GetLastError();
|
ret = GetLastError();
|
||||||
ok(ret == WSAEINVAL, "expected 10022, got %d\n", ret);
|
ok(ret == WSAEINVAL, "expected 10022, got %d\n", ret);
|
||||||
bufs.len = sizeof(char);
|
bufs.len = sizeof(char);
|
||||||
|
@ -4733,6 +4737,8 @@ todo_wine
|
||||||
ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret);
|
ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret);
|
||||||
ret = GetLastError();
|
ret = GetLastError();
|
||||||
ok(ret == WSAEINVAL, "expected 10022, got %d\n", ret);
|
ok(ret == WSAEINVAL, "expected 10022, got %d\n", ret);
|
||||||
|
}
|
||||||
|
else ok(broken(ret == 1) /* <= NT4 */, "expected error, got 1\n");
|
||||||
|
|
||||||
closesocket(dst);
|
closesocket(dst);
|
||||||
optval = 0xdeadbeef;
|
optval = 0xdeadbeef;
|
||||||
|
|
Loading…
Reference in New Issue