summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/run_all_tests.cc
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/tools/test_shell/run_all_tests.cc')
-rw-r--r--webkit/tools/test_shell/run_all_tests.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/run_all_tests.cc b/webkit/tools/test_shell/run_all_tests.cc
index 9a7f55b..60de050 100644
--- a/webkit/tools/test_shell/run_all_tests.cc
+++ b/webkit/tools/test_shell/run_all_tests.cc
@@ -47,9 +47,9 @@ int main(int argc, char* argv[]) {
CommandLine::SetArgcArgv(argc, argv);
#endif
+#if defined(OS_WIN)
TestShell::InitLogging(true, false); // suppress error dialogs
-#if defined(OS_WIN)
// Some of the individual tests wind up calling TestShell::WaitTestFinished
// which has a timeout in it. For these tests, we don't care about a timeout
// so just set it to be a really large number. This is necessary because
@@ -80,8 +80,10 @@ int main(int argc, char* argv[]) {
testing::InitGoogleTest(&argc, argv);
int result = RUN_ALL_TESTS();
+#if defined(OS_WIN)
TestShell::ShutdownTestShell();
TestShell::CleanupLogging();
+#endif
return result;
}