Sebastian Lackner : ntdll/tests: Fix test failures on Windows 10.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Oct 7 10:00:48 CDT 2015
Module: wine
Branch: master
Commit: 53c8345c6dc8e8ac013790a7268a0e3f87a15290
URL: http://source.winehq.org/git/wine.git/?a=commit;h=53c8345c6dc8e8ac013790a7268a0e3f87a15290
Author: Sebastian Lackner <sebastian at fds-team.de>
Date: Wed Oct 7 01:23:27 2015 +0200
ntdll/tests: Fix test failures on Windows 10.
Signed-off-by: Sebastian Lackner <sebastian at fds-team.de>
---
dlls/ntdll/tests/threadpool.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c
index 7be3f0d..9197660 100644
--- a/dlls/ntdll/tests/threadpool.c
+++ b/dlls/ntdll/tests/threadpool.c
@@ -867,6 +867,7 @@ static void test_tp_window_length(void)
NTSTATUS status;
TP_POOL *pool;
DWORD result;
+ BOOL merged;
semaphore = CreateSemaphoreA(NULL, 0, 2, NULL);
ok(semaphore != NULL, "CreateSemaphoreA failed %u\n", GetLastError());
@@ -929,8 +930,8 @@ static void test_tp_window_length(void)
result = WaitForSingleObject(semaphore, 1000);
ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result);
ok(info1.ticks != 0 && info2.ticks != 0, "expected that ticks are nonzero\n");
- ok(info2.ticks >= info1.ticks - 50 && info2.ticks <= info1.ticks + 50,
- "expected that timers are merged\n");
+ merged = info2.ticks >= info1.ticks - 50 && info2.ticks <= info1.ticks + 50;
+ ok(merged || broken(!merged) /* Win 10 */, "expected that timers are merged\n");
/* on Windows the timers also get merged in this case */
info1.ticks = 0;
@@ -948,9 +949,9 @@ static void test_tp_window_length(void)
result = WaitForSingleObject(semaphore, 1000);
ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result);
ok(info1.ticks != 0 && info2.ticks != 0, "expected that ticks are nonzero\n");
+ merged = info2.ticks >= info1.ticks - 50 && info2.ticks <= info1.ticks + 50;
todo_wine
- ok(info2.ticks >= info1.ticks - 50 && info2.ticks <= info1.ticks + 50,
- "expected that timers are merged\n");
+ ok(merged || broken(!merged) /* Win 10 */, "expected that timers are merged\n");
/* cleanup */
pTpReleaseTimer(timer1);
More information about the wine-cvs
mailing list