[PATCH 0/1] MR2811: msvcrt/tests: Document why skip() is used for some missing APIs.
Windows only provides the 32-bit API and using todo_wine win_skip() in the 64-bit case would imply Wine needs fixing. So it's simpler to use a plain skip(). Other schemes like picking between skip() and win_skip() based on bitness feel like they would be way overkill. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2811
From: Francois Gouget <fgouget(a)codeweavers.com> Windows only provides the 32-bit API and using todo_wine win_skip() in the 64-bit case would imply Wine needs fixing. So it's simpler to use a plain skip(). --- dlls/msvcrt/tests/environ.c | 4 ++-- dlls/msvcrt/tests/time.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index 3d6b55dffa8..4b86553800b 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -102,7 +102,7 @@ static void test__environ(void) "Expected _environ pointers to be identical\n" ); } else - skip( "__p__environ() is not available\n" ); + skip( "__p__environ() is not available\n" ); /* 32-bit only on windows */ if (p_get_environ) { @@ -165,7 +165,7 @@ static void test__wenviron(void) "Expected _wenviron pointers to be NULL\n" ); } else - skip( "__p__wenviron() is not available\n" ); + skip( "__p__wenviron() is not available\n" ); /* 32-bit only on windows */ if (p_get_wenviron) { diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index d4e0ac40239..74636954d11 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -592,7 +592,7 @@ static void test_daylight(void) if (!p___p__daylight) { - skip("__p__daylight not available\n"); + skip("__p__daylight not available\n"); /* 32-bit only on windows */ return; } @@ -908,7 +908,7 @@ static void test__tzset(void) int ret; if(!p___p__daylight || !p___p__timezone || !p___p__dstbias) { - skip("__p__daylight, __p__timezone or __p__dstbias is not available\n"); + skip("__p__daylight, __p__timezone or __p__dstbias is not available\n"); /* 32-bit only on windows */ return; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2811
Piotr Caban (@piotr) commented about dlls/msvcrt/tests/environ.c:
"Expected _environ pointers to be identical\n" ); } else - skip( "__p__environ() is not available\n" ); + skip( "__p__environ() is not available\n" ); /* 32-bit only on windows */
What do you think about changing it to something like: ```c if (sizeof(void*) != sizeof(int)) { ok(!p__p__environ, ...); } else { run the tests } ``` In this case skip() is probably not needed (if it is, it can be changed to win_skip). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2811#note_32851
participants (3)
-
Francois Gouget -
Francois Gouget (@fgouget) -
Piotr Caban (@piotr)