Module: wine Branch: master Commit: e4e26bbc3eff51a3afe63fbd7eea1f4a837218ae URL: https://gitlab.winehq.org/wine/wine/-/commit/e4e26bbc3eff51a3afe63fbd7eea1f4...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Sep 1 11:58:50 2022 +0200
ntdll/tests: Fix some race conditions.
---
dlls/ntdll/tests/threadpool.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 18ccca11874..008755e6e5d 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -1163,11 +1163,6 @@ static void CALLBACK instance_semaphore_completion_cb(TP_CALLBACK_INSTANCE *inst static void CALLBACK instance_finalization_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) { HANDLE *semaphores = userdata; - DWORD result; - - Sleep(50); - result = WaitForSingleObject(semaphores[0], 100); - ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %lu\n", result); ReleaseSemaphore(semaphores[1], 1, NULL); }
@@ -1926,7 +1921,7 @@ static void test_tp_multi_wait(void) multi_wait_info.result = 0; ReleaseSemaphore(semaphores[i], 1, NULL);
- result = WaitForSingleObject(semaphore, 100); + result = WaitForSingleObject(semaphore, 2000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); ok(multi_wait_info.result == i, "expected result %d, got %lu\n", i, multi_wait_info.result);
@@ -1939,7 +1934,7 @@ static void test_tp_multi_wait(void) multi_wait_info.result = 0; ReleaseSemaphore(semaphores[i], 1, NULL);
- result = WaitForSingleObject(semaphore, 100); + result = WaitForSingleObject(semaphore, 2000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); ok(multi_wait_info.result == i, "expected result %d, got %lu\n", i, multi_wait_info.result);
@@ -1956,7 +1951,7 @@ static void test_tp_multi_wait(void)
for (i = 0; i < ARRAY_SIZE(semaphores); i++) { - result = WaitForSingleObject(semaphore, 150); + result = WaitForSingleObject(semaphore, 2000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", result); }