Nikolay Sivov : ws2_32/tests: Use todo_wine_if() in tests.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Feb 17 11:15:03 CST 2016
Module: wine
Branch: master
Commit: 944a0228f56f006bdc0ec50776c730db4972e7c5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=944a0228f56f006bdc0ec50776c730db4972e7c5
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Wed Feb 17 02:11:01 2016 +0300
ws2_32/tests: Use todo_wine_if() in tests.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ws2_32/tests/sock.c | 27 ++++-----------------------
1 file changed, 4 insertions(+), 23 deletions(-)
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 4f11cce..d5e01c8 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -1591,17 +1591,10 @@ todo_wine
"SO_PROTOCOL_INFO[A/W] comparison failed\n");
/* Remove IF when WSAEnumProtocols support IPV6 data */
- if (prottest[i].family == AF_INET6)
- {
- todo_wine
+ todo_wine_if (prottest[i].family == AF_INET6)
ok(infoA.iAddressFamily == prottest[i].family, "socket family invalid, expected %d received %d\n",
prottest[i].family, infoA.iAddressFamily);
- }
- else
- {
- ok(infoA.iAddressFamily == prottest[i].family, "socket family invalid, expected %d received %d\n",
- prottest[i].family, infoA.iAddressFamily);
- } ok(infoA.iSocketType == prottest[i].type, "socket type invalid, expected %d received %d\n",
+ ok(infoA.iSocketType == prottest[i].type, "socket type invalid, expected %d received %d\n",
prottest[i].type, infoA.iSocketType);
ok(infoA.iProtocol == prottest[i].proto, "socket protocol invalid, expected %d received %d\n",
prottest[i].proto, infoA.iProtocol);
@@ -2798,27 +2791,15 @@ static void test_WSAEnumNetworkEvents(void)
"Test[%d]: WSAEnumNetworkEvents failed\n", i);
if (i >= 1 && j == 0) /* FD_WRITE is SET on first try for UDP and connected TCP */
{
- if (i == 0) /* Remove when fixed */
- {
- todo_wine
+ todo_wine_if (i == 0) /* Remove when fixed */
ok (net_events.lNetworkEvents == FD_WRITE, "Test[%d]: expected 2, got %d\n",
i, net_events.lNetworkEvents);
- }
- else
- ok (net_events.lNetworkEvents == FD_WRITE, "Test[%d]: expected 2, got %d\n",
- i, net_events.lNetworkEvents);
}
else
{
- if (i != 0) /* Remove when fixed */
- {
- todo_wine
+ todo_wine_if (i != 0) /* Remove when fixed */
ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n",
i, net_events.lNetworkEvents);
- }
- else
- ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n",
- i, net_events.lNetworkEvents);
}
for (k = 0; k < FD_MAX_EVENTS; k++)
{
More information about the wine-cvs
mailing list