diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-05 22:52:35 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-05 22:52:35 +0000 |
| commit | 9fe90b765b5500b3bc0ce5af44b9edf420fef97c (patch) | |
| tree | 4db624130769a67400083372e0021f243e853a32 /webkit/tools/test_shell/run_all_tests.cc | |
| parent | 3fa4dc09b5897c11303a49fe5e893dbb0c21fc01 (diff) | |
| download | chromium_src-9fe90b765b5500b3bc0ce5af44b9edf420fef97c.zip chromium_src-9fe90b765b5500b3bc0ce5af44b9edf420fef97c.tar.gz chromium_src-9fe90b765b5500b3bc0ce5af44b9edf420fef97c.tar.bz2 | |
Enabled WebFrameTest, refactored some test shell functions.
Review URL: http://codereview.chromium.org/9391
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4834 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/run_all_tests.cc')
| -rw-r--r-- | webkit/tools/test_shell/run_all_tests.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/run_all_tests.cc b/webkit/tools/test_shell/run_all_tests.cc index 60de050..9a7f55b 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,10 +80,8 @@ 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; } |