[PATCH 0/1] MR1287: ws2_32/tests: Don't test protocol name in test_WSASocket().

[Paul Gofman (＠gofman)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53893

[PATCH 1/1] ws2_32/tests: Don't test protocol name in test_WSASocket().

[Paul Gofman]

From: Paul Gofman

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53893
---
 dlls/ws2_32/tests/sock.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 9b39ecff3c5..d4d92b58c41 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -3270,9 +3270,8 @@ static void test_WSASocket(void)
         size = sizeof(info);
         err = getsockopt(sock, SOL_SOCKET, SO_PROTOCOL_INFOW, (char *) &info, &size);
         ok(!err,"got error %d\n", WSAGetLastError());
-        ok(!wcscmp(info.szProtocol, L"MSAFD Tcpip [RAW/IP]")
-                || broken(!wcscmp(info.szProtocol, L"MSAFD-Tcpip [RAW/IP]")) /* Some Win7 machines. */,
-                "got szProtocol %s.\n", debugstr_w(info.szProtocol));
+        /* Protocol name in info.szProtocol is not entirely consistent across Windows versions and
+         * locales, so not testing it. */
         ok(info.iAddressFamily == AF_INET, "got iAddressFamily %d.\n", info.iAddressFamily);
         ok(info.iSocketType == SOCK_RAW, "got iSocketType %d.\n", info.iSocketType);
         ok(info.iMaxSockAddr == 0x10, "got iMaxSockAddr %d.\n", info.iMaxSockAddr);

[PATCH 1/1] ws2_32/tests: Don't test protocol name in test_WSASocket().

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=125879

Your paranoid android.

=== w10pro64_en_AE_u8 (64 bit report) ===

ws2_32:
sock.c:7651: Test failed: wrong count 0
sock.c:7660: Test failed: wrong count 1

=== w10pro64_ar (64 bit report) ===

ws2_32:
sock.c:7651: Test failed: wrong count 0
sock.c:7660: Test failed: wrong count 1

=== w10pro64_ja (64 bit report) ===

ws2_32:
sock.c:7651: Test failed: wrong count 0
sock.c:7660: Test failed: wrong count 1

=== w10pro64_zh_CN (64 bit report) ===

ws2_32:
sock.c:4525: Test failed: expected 1, got 0
sock.c:4526: Test failed: fdWrite socket is not in the set