From: Bernhard Übelacker bernhardu@mailbox.org
My previous commit disabled the whole test in Windows 8 while some tests would still be able to run.
Followup to be9bd74cde.
Co-Authored-By: Alfred Agrell floating@muncher.se --- dlls/kernel32/tests/console.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 10d93faaf0f..02c34a3aa3b 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -5643,7 +5643,7 @@ static void test_child_free_console(void) } AllocConsole(); /* need a new console so that the unbound handles point to something */
- if (std && std != INVALID_HANDLE_VALUE && !pNtCompareObjects(std_clone, GetStdHandle(STD_ERROR_HANDLE))) + if (std && std != INVALID_HANDLE_VALUE && pNtCompareObjects && !pNtCompareObjects(std_clone, GetStdHandle(STD_ERROR_HANDLE))) exit_code |= CFC_SAME_OBJECTS;
CloseHandle(std_clone); @@ -5678,7 +5678,7 @@ static void test_FreeConsoleStd(void) {DETACHED_PROCESS, with_none, 0}, };
- if (!pVerifyConsoleIoHandle || !pNtCompareObjects) + if (!pVerifyConsoleIoHandle || skip_nt) { win_skip("Can't run test\n"); return; @@ -5710,7 +5710,9 @@ static void test_FreeConsoleStd(void) status = WaitForSingleObject(info.hProcess, INFINITE); ok(status == WAIT_OBJECT_0, "Unexpected wait status\n"); ret = GetExitCodeProcess(info.hProcess, &status); - ok(status == tests[i].expected_bits, "Expected %x but got %lx\n", tests[i].expected_bits, status); + ok(status == tests[i].expected_bits || + broken(!pNtCompareObjects && status == (tests[i].expected_bits & ~CFC_SAME_OBJECTS)), + "Expected %x but got %lx\n", tests[i].expected_bits, status); switch (tests[i].with) { case with_global: