iphlpapi/tests: Skip tests if functions are not supported

André Hentschel nerv at dawncrow.de
Sun Oct 7 11:35:55 CDT 2012


For Mac, BSD, Solaris
---
 dlls/iphlpapi/tests/iphlpapi.c |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c
index 26bf26e..c13b733 100644
--- a/dlls/iphlpapi/tests/iphlpapi.c
+++ b/dlls/iphlpapi/tests/iphlpapi.c
@@ -541,6 +541,13 @@ static void testGetIcmpStatisticsEx(void)
          "GetIcmpStatisticsEx(NULL, AF_INET) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn);
     }
 
+    apiReturn = pGetIcmpStatisticsEx(&stats, AF_INET6);
+    if (apiReturn == ERROR_NOT_SUPPORTED)
+    {
+      skip("GetIcmpStatisticsEx is not supported\n");
+      return;
+    }
+
     apiReturn = pGetIcmpStatisticsEx(&stats, AF_BAN);
     ok(apiReturn == ERROR_INVALID_PARAMETER,
        "GetIcmpStatisticsEx(&stats, AF_BAN) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn);
@@ -582,6 +589,13 @@ static void testGetIpStatisticsEx(void)
         return;
     }
 
+    apiReturn = pGetIpStatisticsEx(&stats, AF_INET6);
+    if (apiReturn == ERROR_NOT_SUPPORTED)
+    {
+      skip("GetIpStatisticsEx is not supported\n");
+      return;
+    }
+
     apiReturn = pGetIpStatisticsEx(NULL, AF_INET);
     ok(apiReturn == ERROR_INVALID_PARAMETER,
        "GetIpStatisticsEx(NULL, AF_INET) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn);
@@ -663,6 +677,13 @@ static void testGetTcpStatisticsEx(void)
         return;
     }
 
+    apiReturn = pGetTcpStatisticsEx(&stats, AF_INET6);
+    if (apiReturn == ERROR_NOT_SUPPORTED)
+    {
+      skip("GetTcpStatisticsEx is not supported\n");
+      return;
+    }
+
     apiReturn = pGetTcpStatisticsEx(NULL, AF_INET);
     ok(apiReturn == ERROR_INVALID_PARAMETER,
        "GetTcpStatisticsEx(NULL, AF_INET); returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn);
@@ -694,8 +715,8 @@ static void testGetTcpStatisticsEx(void)
     }
 
     apiReturn = pGetTcpStatisticsEx(&stats, AF_INET6);
-    todo_wine ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED),
-                 "GetTcpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn);
+    ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED),
+       "GetTcpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn);
     if (apiReturn == NO_ERROR && winetest_debug > 1)
     {
         trace( "TCP IPv6 Ex stats:\n" );
@@ -728,6 +749,13 @@ static void testGetUdpStatisticsEx(void)
         return;
     }
 
+    apiReturn = pGetUdpStatisticsEx(&stats, AF_INET6);
+    if (apiReturn == ERROR_NOT_SUPPORTED)
+    {
+      skip("GetUdpStatisticsEx is not supported\n");
+      return;
+    }
+
     apiReturn = pGetUdpStatisticsEx(NULL, AF_INET);
     ok(apiReturn == ERROR_INVALID_PARAMETER,
        "GetUdpStatisticsEx(NULL, AF_INET); returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn);
-- 
1.7.4.1



-- 

Best Regards, André Hentschel


More information about the wine-patches mailing list