Skip to content

W
wine-winehq
Commit d14456ce authored by Daniel Lehman's avatar Daniel Lehman Committed by Alexandre Julliard
Browse files
Options

kernel32/tests: Don't call DeleteFile from assert().

Signed-off-by: 's avatarDaniel Lehman <dlehman25@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 4310ebcd
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 28 deletions
dlls/kernel32/tests/debugger.c
View file @ d14456ce
...@@ -321,8 +321,8 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) ...@@ -321,8 +321,8 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks)
TerminateProcess(info.hProcess, WAIT_TIMEOUT); TerminateProcess(info.hProcess, WAIT_TIMEOUT);
WaitForSingleObject(info.hProcess, 5000); WaitForSingleObject(info.hProcess, 5000);
CloseHandle(info.hProcess); CloseHandle(info.hProcess);
assert(DeleteFileA(dbglog) != 0); DeleteFileA(dbglog);
assert(DeleteFileA(childlog) != 0); DeleteFileA(childlog);
win_skip("Giving up on child process\n"); win_skip("Giving up on child process\n");
return; return;
} }
...@@ -357,8 +357,8 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) ...@@ -357,8 +357,8 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks)
skip_crash_and_debug = broken(wait_code == WAIT_TIMEOUT); skip_crash_and_debug = broken(wait_code == WAIT_TIMEOUT);
if (skip_crash_and_debug) if (skip_crash_and_debug)
{ {
assert(DeleteFileA(dbglog) != 0); DeleteFileA(dbglog);
assert(DeleteFileA(childlog) != 0); DeleteFileA(childlog);
win_skip("Giving up on debugger\n"); win_skip("Giving up on debugger\n");
return; return;
} }
...@@ -375,8 +375,8 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) ...@@ -375,8 +375,8 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks)
ok(dbg_blackbox.nokill_rc, "DebugSetProcessKillOnExit(FALSE) failed err=%d\n", dbg_blackbox.nokill_err); ok(dbg_blackbox.nokill_rc, "DebugSetProcessKillOnExit(FALSE) failed err=%d\n", dbg_blackbox.nokill_err);
ok(dbg_blackbox.detach_rc, "DebugActiveProcessStop(%d) failed err=%d\n", dbg_blackbox.pid, dbg_blackbox.detach_err); ok(dbg_blackbox.detach_rc, "DebugActiveProcessStop(%d) failed err=%d\n", dbg_blackbox.pid, dbg_blackbox.detach_err);
assert(DeleteFileA(dbglog) != 0); DeleteFileA(dbglog);
assert(DeleteFileA(childlog) != 0); DeleteFileA(childlog);
} }
static void crash_and_winedbg(HKEY hkey, const char* argv0) static void crash_and_winedbg(HKEY hkey, const char* argv0)
......
dlls/kernel32/tests/process.c
View file @ d14456ce
...@@ -632,7 +632,7 @@ static void test_Startup(void) ...@@ -632,7 +632,7 @@ static void test_Startup(void)
okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "dwFlags", startup.dwFlags);
okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow);
release_memory(); release_memory();
assert(DeleteFileA(resfile) != 0); DeleteFileA(resfile);
/* not so simplistic now */ /* not so simplistic now */
memset(&startup, 0, sizeof(startup)); memset(&startup, 0, sizeof(startup));
...@@ -670,7 +670,7 @@ static void test_Startup(void) ...@@ -670,7 +670,7 @@ static void test_Startup(void)
okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "dwFlags", startup.dwFlags);
okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow);
release_memory(); release_memory();
assert(DeleteFileA(resfile) != 0); DeleteFileA(resfile);
/* not so simplistic now */ /* not so simplistic now */
memset(&startup, 0, sizeof(startup)); memset(&startup, 0, sizeof(startup));
...@@ -708,7 +708,7 @@ static void test_Startup(void) ...@@ -708,7 +708,7 @@ static void test_Startup(void)
okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "dwFlags", startup.dwFlags);
okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow);
release_memory(); release_memory();
assert(DeleteFileA(resfile) != 0); DeleteFileA(resfile);
/* not so simplistic now */ /* not so simplistic now */
memset(&startup, 0, sizeof(startup)); memset(&startup, 0, sizeof(startup));
...@@ -746,7 +746,7 @@ static void test_Startup(void) ...@@ -746,7 +746,7 @@ static void test_Startup(void)
okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "dwFlags", startup.dwFlags);
okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow);
release_memory(); release_memory();
assert(DeleteFileA(resfile) != 0); DeleteFileA(resfile);
/* not so simplistic now */ /* not so simplistic now */
memset(&startup, 0, sizeof(startup)); memset(&startup, 0, sizeof(startup));
...@@ -786,7 +786,7 @@ static void test_Startup(void) ...@@ -786,7 +786,7 @@ static void test_Startup(void)
okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "dwFlags", startup.dwFlags);
okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow);
release_memory(); release_memory();
assert(DeleteFileA(resfile) != 0); DeleteFileA(resfile);
/* not so simplistic now */ /* not so simplistic now */
memset(&startup, 0, sizeof(startup)); memset(&startup, 0, sizeof(startup));
...@@ -824,7 +824,7 @@ static void test_Startup(void) ...@@ -824,7 +824,7 @@ static void test_Startup(void)
okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "dwFlags", startup.dwFlags);
okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow);
release_memory(); release_memory();
assert(DeleteFileA(resfile) != 0); DeleteFileA(resfile);
/* not so simplistic now */ /* not so simplistic now */
memset(&startup, 0, sizeof(startup)); memset(&startup, 0, sizeof(startup));
...@@ -862,7 +862,7 @@ static void test_Startup(void) ...@@ -862,7 +862,7 @@ static void test_Startup(void)
okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "dwFlags", startup.dwFlags);
okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow);
release_memory(); release_memory();
assert(DeleteFileA(resfile) != 0); DeleteFileA(resfile);
/* TODO: test for A/W and W/A and W/W */ /* TODO: test for A/W and W/A and W/W */
} }
...@@ -894,7 +894,7 @@ static void test_CommandLine(void) ...@@ -894,7 +894,7 @@ static void test_CommandLine(void)
okChildString("Arguments", "argvA5", NULL); okChildString("Arguments", "argvA5", NULL);
okChildString("Arguments", "CommandLineA", buffer); okChildString("Arguments", "CommandLineA", buffer);
release_memory(); release_memory();
assert(DeleteFileA(resfile) != 0); DeleteFileA(resfile);
memset(&startup, 0, sizeof(startup)); memset(&startup, 0, sizeof(startup));
startup.cb = sizeof(startup); startup.cb = sizeof(startup);
...@@ -917,7 +917,7 @@ static void test_CommandLine(void) ...@@ -917,7 +917,7 @@ static void test_CommandLine(void)
okChildString("Arguments", "argvA7", NULL); okChildString("Arguments", "argvA7", NULL);
okChildString("Arguments", "CommandLineA", buffer); okChildString("Arguments", "CommandLineA", buffer);
release_memory(); release_memory();
assert(DeleteFileA(resfile) != 0); DeleteFileA(resfile);
/* Test for Bug1330 to show that XP doesn't change '/' to '\\' in argv[0]*/ /* Test for Bug1330 to show that XP doesn't change '/' to '\\' in argv[0]*/
get_file_name(resfile); get_file_name(resfile);
...@@ -933,7 +933,7 @@ static void test_CommandLine(void) ...@@ -933,7 +933,7 @@ static void test_CommandLine(void)
sprintf(buffer, "./%s", exename); sprintf(buffer, "./%s", exename);
okChildString("Arguments", "argvA0", buffer); okChildString("Arguments", "argvA0", buffer);
release_memory(); release_memory();
assert(DeleteFileA(resfile) != 0); DeleteFileA(resfile);
get_file_name(resfile); get_file_name(resfile);
/* Use exename to avoid buffer containing things like 'C:' */ /* Use exename to avoid buffer containing things like 'C:' */
...@@ -948,8 +948,8 @@ static void test_CommandLine(void) ...@@ -948,8 +948,8 @@ static void test_CommandLine(void)
sprintf(buffer, ".\\%s", exename); sprintf(buffer, ".\\%s", exename);
okChildString("Arguments", "argvA0", buffer); okChildString("Arguments", "argvA0", buffer);
release_memory(); release_memory();
assert(DeleteFileA(resfile) != 0); DeleteFileA(resfile);
get_file_name(resfile); get_file_name(resfile);
GetFullPathNameA(selfname, MAX_PATH, fullpath, &lpFilePart); GetFullPathNameA(selfname, MAX_PATH, fullpath, &lpFilePart);
assert ( lpFilePart != 0); assert ( lpFilePart != 0);
...@@ -969,7 +969,7 @@ static void test_CommandLine(void) ...@@ -969,7 +969,7 @@ static void test_CommandLine(void)
else sprintf(buffer, "./%s", exename); else sprintf(buffer, "./%s", exename);
okChildString("Arguments", "argvA0", buffer); okChildString("Arguments", "argvA0", buffer);
release_memory(); release_memory();
assert(DeleteFileA(resfile) != 0); DeleteFileA(resfile);
/* Using AppName */ /* Using AppName */
get_file_name(resfile); get_file_name(resfile);
...@@ -993,7 +993,7 @@ static void test_CommandLine(void) ...@@ -993,7 +993,7 @@ static void test_CommandLine(void)
okChildString("Arguments", "CommandLineA", buffer2); okChildString("Arguments", "CommandLineA", buffer2);
okChildStringWA("Arguments", "CommandLineW", buffer2); okChildStringWA("Arguments", "CommandLineW", buffer2);
release_memory(); release_memory();
assert(DeleteFileA(resfile) != 0); DeleteFileA(resfile);
if (0) /* Test crashes on NT-based Windows. */ if (0) /* Test crashes on NT-based Windows. */
{ {
...@@ -1088,7 +1088,7 @@ static void test_Directory(void) ...@@ -1088,7 +1088,7 @@ static void test_Directory(void)
okChildIString("Misc", "CurrDirA", windir); okChildIString("Misc", "CurrDirA", windir);
release_memory(); release_memory();
assert(DeleteFileA(resfile) != 0); DeleteFileA(resfile);
/* search PATH for the exe if directory is NULL */ /* search PATH for the exe if directory is NULL */
ok(CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); ok(CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n");
...@@ -1301,7 +1301,7 @@ static void test_Environment(void) ...@@ -1301,7 +1301,7 @@ static void test_Environment(void)
env = GetEnvironmentStringsA(); env = GetEnvironmentStringsA();
cmpEnvironment(env); cmpEnvironment(env);
release_memory(); release_memory();
assert(DeleteFileA(resfile) != 0); DeleteFileA(resfile);
memset(&startup, 0, sizeof(startup)); memset(&startup, 0, sizeof(startup));
startup.cb = sizeof(startup); startup.cb = sizeof(startup);
...@@ -1360,7 +1360,7 @@ static void test_Environment(void) ...@@ -1360,7 +1360,7 @@ static void test_Environment(void)
HeapFree(GetProcessHeap(), 0, child_env); HeapFree(GetProcessHeap(), 0, child_env);
FreeEnvironmentStringsA(env); FreeEnvironmentStringsA(env);
release_memory(); release_memory();
assert(DeleteFileA(resfile) != 0); DeleteFileA(resfile);
} }
static void test_SuspendFlag(void) static void test_SuspendFlag(void)
...@@ -1408,7 +1408,7 @@ static void test_SuspendFlag(void) ...@@ -1408,7 +1408,7 @@ static void test_SuspendFlag(void)
okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "dwFlags", startup.dwFlags);
okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow);
release_memory(); release_memory();
assert(DeleteFileA(resfile) != 0); DeleteFileA(resfile);
} }
static void test_DebuggingFlag(void) static void test_DebuggingFlag(void)
...@@ -1470,7 +1470,7 @@ static void test_DebuggingFlag(void) ...@@ -1470,7 +1470,7 @@ static void test_DebuggingFlag(void)
okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "dwFlags", startup.dwFlags);
okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow);
release_memory(); release_memory();
assert(DeleteFileA(resfile) != 0); DeleteFileA(resfile);
} }
static BOOL is_console(HANDLE h) static BOOL is_console(HANDLE h)
...@@ -1617,7 +1617,7 @@ static void test_Console(void) ...@@ -1617,7 +1617,7 @@ static void test_Console(void)
ok(sbiC.dwCursorPosition.Y == (sbi.dwCursorPosition.Y ^ 1), "Wrong cursor position\n"); ok(sbiC.dwCursorPosition.Y == (sbi.dwCursorPosition.Y ^ 1), "Wrong cursor position\n");
release_memory(); release_memory();
assert(DeleteFileA(resfile) != 0); DeleteFileA(resfile);
ok(CreatePipe(&hParentIn, &hChildOut, NULL, 0), "Creating parent-input pipe\n"); ok(CreatePipe(&hParentIn, &hChildOut, NULL, 0), "Creating parent-input pipe\n");
ok(DuplicateHandle(GetCurrentProcess(), hChildOut, GetCurrentProcess(), ok(DuplicateHandle(GetCurrentProcess(), hChildOut, GetCurrentProcess(),
...@@ -1660,7 +1660,7 @@ static void test_Console(void) ...@@ -1660,7 +1660,7 @@ static void test_Console(void)
okChildString("StdHandle", "msg", msg); okChildString("StdHandle", "msg", msg);
release_memory(); release_memory();
assert(DeleteFileA(resfile) != 0); DeleteFileA(resfile);
} }
static void test_ExitCode(void) static void test_ExitCode(void)
...@@ -1689,7 +1689,7 @@ static void test_ExitCode(void) ...@@ -1689,7 +1689,7 @@ static void test_ExitCode(void)
okChildInt("ExitCode", "value", code); okChildInt("ExitCode", "value", code);
release_memory(); release_memory();
assert(DeleteFileA(resfile) != 0); DeleteFileA(resfile);
} }
static void test_OpenProcess(void) static void test_OpenProcess(void)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment