Rebase against c82c5e96a9eb13bfa1fef95fb7467ce17624a341.

This commit is contained in:
Alistair Leslie-Hughes
2021-06-18 11:13:24 +10:00
parent 876024f44f
commit 5d26dfaa93
6 changed files with 39 additions and 44 deletions

View File

@@ -1,4 +1,4 @@
From 339c0672e50344eabb605e13f3c58f7f534417dc Mon Sep 17 00:00:00 2001
From 414a6313d1562ce78fd2700d5ee1aeac14e87868 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Thu, 9 Jan 2020 13:44:01 -0600
Subject: [PATCH] ntdll/tests: Move some tests to a new sync.c file.
@@ -24,7 +24,7 @@ index ed15c51339f..9a99c01bd7c 100644
time.c \
virtual.c
diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c
index 7d9ca47be12..d06812a9529 100644
index 82f8188d176..9a9536f4639 100644
--- a/dlls/ntdll/tests/om.c
+++ b/dlls/ntdll/tests/om.c
@@ -30,10 +30,6 @@
@@ -586,7 +586,7 @@ index 7d9ca47be12..d06812a9529 100644
- status = pRtlWaitOnAddress(&address, &compare, 8, &timeout);
- ticks = GetTickCount() - ticks;
- ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status);
- ok(ticks >= 90 && ticks <= 1000, "got %u\n", ticks);
- ok(ticks >= 80 && ticks <= 1000, "got %u\n", ticks);
- ok(address == 0, "got %s\n", wine_dbgstr_longlong(address));
- ok(compare == 0, "got %s\n", wine_dbgstr_longlong(compare));
-
@@ -601,7 +601,7 @@ index 7d9ca47be12..d06812a9529 100644
- status = pRtlWaitOnAddress(&address, &compare, size, &timeout);
- ticks = GetTickCount() - ticks;
- ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status);
- ok(ticks >= 90 && ticks <= 1000, "got %u\n", ticks);
- ok(ticks >= 80 && ticks <= 1000, "got %u\n", ticks);
-
- status = pRtlWaitOnAddress(&address, &compare, size << 1, &timeout);
- ok(!status, "got 0x%08x\n", status);