[PATCH 4/5] ws2_32/tests: some IP_HDRINCL tests pass on FreeBSD - wine-devel - winehq.org

List overview All Threads

[PATCH 4/5] ws2_32/tests: some IP_HDRINCL tests pass on FreeBSD

[PATCH 1/3] wininet/tests: Don't...

[PATCH v5 1/2] gdi32/tests:...

Damjan Jovanovic

5 Jan 2020 5 Jan '20

6:32 p.m.

Signed-off-by: Damjan Jovanovic damjan.jov@gmail.com --- dlls/ws2_32/tests/sock.c | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-)

Attachments:

0004-ws2_32-tests-some-IP_HDRINCL-tests-pass-on-FreeBSD.txt (text/plain — 2.3 KB)

Show replies by date

Marvin

5 Jan 5 Jan

7:31 p.m.

Hi,

While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?

Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=62870

Your paranoid android.

=== debian10 (32 bit report) ===

ws2_32: sock.c:1464: Test failed: expected 4096, got 8192 sock.c:1477: Test failed: expected 4096, got 8192 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0 sock.c:3085: Test failed: Test[1]: expected 2, got 0 sock.c:3085: Test failed: Test[2]: expected 2, got 0 sock.c:3085: Test failed: Test[1]: expected 2, got 0 sock.c:3085: Test failed: Test[2]: expected 2, got 0

=== debian10 (32 bit French report) ===

ws2_32: sock.c:1464: Test failed: expected 4096, got 8192 sock.c:1477: Test failed: expected 4096, got 8192 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0 sock.c:3091: Test succeeded inside todo block: Test[1]: expected 0, got 0

=== debian10 (32 bit Japanese:Japan report) ===

ws2_32: sock.c:1464: Test failed: expected 4096, got 8192 sock.c:1477: Test failed: expected 4096, got 8192 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0

=== debian10 (32 bit Chinese:China report) ===

ws2_32: sock.c:1464: Test failed: expected 4096, got 8192 sock.c:1477: Test failed: expected 4096, got 8192 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0

=== debian10 (32 bit WoW report) ===

ws2_32: sock.c:1464: Test failed: expected 4096, got 8192 sock.c:1477: Test failed: expected 4096, got 8192 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0

=== debian10 (64 bit WoW report) ===

ws2_32: sock.c:1464: Test failed: expected 4096, got 8192 sock.c:1477: Test failed: expected 4096, got 8192 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0 sock.c:1696: Test failed: Expected 10022, got 10042 sock.c:1703: Test failed: Expected -1, got 0 sock.c:1709: Test failed: Expected 10022, got -559038737 sock.c:1713: Test failed: Expected 99, got 0 sock.c:1725: Test failed: Expected 10022, got 10042 sock.c:1732: Test failed: Expected -1, got 0 sock.c:1738: Test failed: Expected 10022, got -559038737 sock.c:1742: Test failed: Expected 99, got 0 sock.c:3091: Test succeeded inside todo block: Test[1]: expected 0, got 0

Alexandre Julliard

6 Jan 6 Jan

9:16 p.m.

Damjan Jovanovic damjan.jov@gmail.com writes:

Signed-off-by: Damjan Jovanovic damjan.jov@gmail.com

dlls/ws2_32/tests/sock.c | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6ee50d94b6..1a3eba529e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1688,30 +1688,58 @@ todo_wine err = setsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, size); if (err == -1) /* >= Vista */ {
       todo_wine {
+#if defined(linux) +todo_wine +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +todo_wine_if (prottest[i].family == AF_INET) +#endif ok(GetLastError() == WSAEINVAL, "Expected 10022, got %d\n", GetLastError()); k = 99; SetLastError(0xdeadbeef); err = getsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, &size); +#if defined(linux) +todo_wine +#endif ok(err == -1, "Expected -1, got %d\n", err); +#if defined(linux) +todo_wine +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +todo_wine_if (prottest[i].family == AF_INET) +#endif ok(GetLastError() == WSAEINVAL, "Expected 10022, got %d\n", GetLastError()); +#if defined(linux) +todo_wine +#endif ok(k == 99, "Expected 99, got %d\n", k);
         size = sizeof(k);
         k = 0;
         SetLastError(0xdeadbeef);
         err = setsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, size);
       }
       ok(err == -1, "Expected -1, got %d\n", err);
       todo_wine {
+#if defined(linux) +todo_wine +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +todo_wine_if (prottest[i].family == AF_INET) +#endif ok(GetLastError() == WSAEINVAL, "Expected 10022, got %d\n", GetLastError()); k = 99; SetLastError(0xdeadbeef); err = getsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, &size); +#if defined(linux) +todo_wine +#endif ok(err == -1, "Expected -1, got %d\n", err); +#if defined(linux) +todo_wine +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +todo_wine_if (prottest[i].family == AF_INET) +#endif ok(GetLastError() == WSAEINVAL, "Expected 10022, got %d\n", GetLastError()); +#if defined(linux) +todo_wine +#endif

I don't think we want to add a million #ifdefs for this. It would be better to fix the code to work correctly in a platform-independent way.

-- Alexandre Julliard julliard@winehq.org

1858

Age (days ago)

1859

Last active (days ago)

wine-devel@winehq.org

2 comments

3 participants

tags (0)

participants (3)

Alexandre Julliard
Damjan Jovanovic
Marvin