kernel32: skip console tests if stdin/stdout are redirected
Austin English
austinenglish at gmail.com
Tue May 6 05:31:59 CDT 2014
For https://bugs.winehq.org/show_bug.cgi?id=28220
--
-Austin
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20140506/b2c73939/attachment-0001.html>
-------------- next part --------------
diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
index 218a0d3..0dfa831 100644
--- a/dlls/kernel32/tests/process.c
+++ b/dlls/kernel32/tests/process.c
@@ -1332,9 +1332,17 @@ static void test_Console(void)
startup.hStdInput = CreateFileA("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, &sa, OPEN_EXISTING, 0, 0);
startup.hStdOutput = CreateFileA("CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, &sa, OPEN_EXISTING, 0, 0);
}
- /* now verify everything's ok */
- ok(startup.hStdInput != INVALID_HANDLE_VALUE, "Opening ConIn\n");
- ok(startup.hStdOutput != INVALID_HANDLE_VALUE, "Opening ConOut\n");
+ /* now verify everything is okay. If the user is redirecting stdout, this will fail. */
+ if(startup.hStdInput==INVALID_HANDLE_VALUE)
+ {
+ skip("Cannot open ConIn, skipping tests\n");
+ return;
+ }
+ if(startup.hStdOutput==INVALID_HANDLE_VALUE)
+ {
+ skip("Cannot open ConOut, skipping tests\n");
+ return;
+ }
startup.hStdError = startup.hStdOutput;
ok(GetConsoleScreenBufferInfo(startup.hStdOutput, &sbi), "Getting sb info\n");
More information about the wine-patches
mailing list