[PATCH 0/1] MR2813: ntdll/tests: Use win_skip() for missing APIs.

[Francois Gouget (＠fgouget)]

A missing API is a todo in Wine.

[PATCH 1/1] ntdll/tests: Use win_skip() for missing APIs.

[Francois Gouget]

From: Francois Gouget

A missing API is a todo in Wine.
---
 dlls/ntdll/tests/exception.c | 6 +++---
 dlls/ntdll/tests/om.c        | 2 +-
 dlls/ntdll/tests/port.c      | 2 +-
 dlls/ntdll/tests/rtl.c       | 8 ++++----
 dlls/ntdll/tests/rtlstr.c    | 4 ++--
 dlls/ntdll/tests/virtual.c   | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index a70faef6676..128b2adde3b 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -9509,7 +9509,7 @@ static void test_extended_context(void)

if (!pRtlGetEnabledExtendedFeatures)
     {
-        skip("RtlGetEnabledExtendedFeatures is not available.\n");
+        win_skip("RtlGetEnabledExtendedFeatures is not available.\n");
         return;
     }

@@ -10492,7 +10492,7 @@ static void test_copy_context(void)

if (!pRtlGetEnabledExtendedFeatures)
     {
-        skip("RtlGetEnabledExtendedFeatures is not available.\n");
+        win_skip("RtlGetEnabledExtendedFeatures is not available.\n");
         return;
     }

@@ -10969,7 +10969,7 @@ START_TEST(exception)
     if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry)
       test_dynamic_unwind();
     else
-      skip( "Dynamic unwind functions not found\n" );
+      win_skip( "Dynamic unwind functions not found\n" );
     test_extended_context();
     test_copy_context();
     test_unwind_from_apc();
diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c
index 6e5a9ef64b1..c03b5e4cfca 100644
--- a/dlls/ntdll/tests/om.c
+++ b/dlls/ntdll/tests/om.c
@@ -2523,7 +2523,7 @@ static void test_object_identity(void)

if (!pNtCompareObjects)
     {
-        skip("NtCompareObjects is not available.\n");
+        win_skip("NtCompareObjects is not available.\n");
         return;
     }

diff --git a/dlls/ntdll/tests/port.c b/dlls/ntdll/tests/port.c
index 942f00b1b76..80c60d09683 100644
--- a/dlls/ntdll/tests/port.c
+++ b/dlls/ntdll/tests/port.c
@@ -155,7 +155,7 @@ static BOOL init_function_ptrs(void)
         !pNtRequestPort || !pNtRegisterThreadTerminatePort ||
         !pNtConnectPort || !pRtlInitUnicodeString)
     {
-        skip("Needed port functions are not available\n");
+        todo_wine win_skip("Needed port functions are not available\n");
         FreeLibrary(hntdll);
         return FALSE;
     }
diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c
index b1ef492627a..76cecebae34 100644
--- a/dlls/ntdll/tests/rtl.c
+++ b/dlls/ntdll/tests/rtl.c
@@ -1133,7 +1133,7 @@ static void test_RtlIpv4StringToAddressEx(void)

if (!pRtlIpv4StringToAddressExA)
     {
-        skip("RtlIpv4StringToAddressEx not available\n");
+        win_skip("RtlIpv4StringToAddressEx not available\n");
         return;
     }

@@ -1780,7 +1780,7 @@ static void test_RtlIpv6AddressToStringEx(void)

if (!pRtlIpv6AddressToStringExA)
     {
-        skip("RtlIpv6AddressToStringExA not available\n");
+        win_skip("RtlIpv6AddressToStringExA not available\n");
         return;
     }

@@ -2066,13 +2066,13 @@ static void test_RtlIpv6StringToAddressEx(void)

if (!pRtlIpv6StringToAddressExW)
     {
-        skip("RtlIpv6StringToAddressExW not available\n");
+        win_skip("RtlIpv6StringToAddressExW not available\n");
         /* we can continue, just not test W */
     }

if (!pRtlIpv6StringToAddressExA)
     {
-        skip("RtlIpv6StringToAddressExA not available\n");
+        win_skip("RtlIpv6StringToAddressExA not available\n");
         return;
     }

diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c
index 8988aadeac4..53ac223980e 100644
--- a/dlls/ntdll/tests/rtlstr.c
+++ b/dlls/ntdll/tests/rtlstr.c
@@ -2136,7 +2136,7 @@ static void test_RtlUnicodeToUTF8N(void)

if (!pRtlUnicodeToUTF8N)
     {
-        skip("RtlUnicodeToUTF8N unavailable\n");
+        win_skip("RtlUnicodeToUTF8N is not available\n");
         return;
     }

@@ -2469,7 +2469,7 @@ static void test_RtlUTF8ToUnicodeN(void)

if (!pRtlUTF8ToUnicodeN)
     {
-        skip("RtlUTF8ToUnicodeN unavailable\n");
+        win_skip("RtlUTF8ToUnicodeN is not available\n");
         return;
     }

diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c
index ffa462f579f..c125fdff0d7 100644
--- a/dlls/ntdll/tests/virtual.c
+++ b/dlls/ntdll/tests/virtual.c
@@ -1658,7 +1658,7 @@ static void test_user_shared_data(void)

if (!pRtlGetEnabledExtendedFeatures)
     {
-        skip("RtlGetEnabledExtendedFeatures is not available.\n");
+        win_skip("RtlGetEnabledExtendedFeatures is not available.\n");
         return;
     }

[PATCH 1/1] ntdll/tests: Use win_skip() for missing APIs.

[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 tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

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

Your paranoid android.

=== w11pro64 (32 bit report) ===

ntdll:
exception.c:9622: Test failed: Got unexpected p CD70C69C, flags 0x100001.
exception.c:9625: Test failed: Got unexpected p CD70C69C, length 0xcccccccc, flags 0x100001.

=== w11pro64_amd (64 bit report) ===

ntdll:
exception.c:2132: Test failed: 0/8: wrong frame 0000000000ADF598/0000000000ADF480
exception.c:2132: Test failed: 0/9: wrong frame 0000000000ADF478/0000000000ADF480
exception.c:2132: Test failed: 0/10: wrong frame 0000000000ADF470/0000000000ADF480
exception.c:4870: Test failed: Got unexpected frame 0000000000ADFC40.
exception.c:9622: Test failed: Got unexpected p FFFFFFFFCD7ABDDC, flags 0x100001.
exception.c:9625: Test failed: Got unexpected p FFFFFFFFCD7ABDDC, length 0xcccccccc, flags 0x100001.