summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/mac
diff options
context:
space:
mode:
authorpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-15 18:37:39 +0000
committerpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-15 18:37:39 +0000
commitfa8506d543d349ac13436ecd465c9eac6fefb972 (patch)
tree632f3e9449f28be947b0e399b896d69a687b7f31 /webkit/tools/test_shell/mac
parentbe96d077f38a96d420c0ed982e9b78ddc224791a (diff)
downloadchromium_src-fa8506d543d349ac13436ecd465c9eac6fefb972.zip
chromium_src-fa8506d543d349ac13436ecd465c9eac6fefb972.tar.gz
chromium_src-fa8506d543d349ac13436ecd465c9eac6fefb972.tar.bz2
When running layout tests, have logging only go to a file. This prevents info and warning messgaes from impacting the layout test output and causing failures. Switch to abort() on mac when timing out, terminate: sometimes can still hang the app. Hide the window instead of trying to move it offscreen, which Cocoa doesn't want to let us do.
Review URL: http://codereview.chromium.org/7405 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3403 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/mac')
-rw-r--r--webkit/tools/test_shell/mac/main.mm5
1 files changed, 2 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/mac/main.mm b/webkit/tools/test_shell/mac/main.mm
index b1f095b..44e3b58 100644
--- a/webkit/tools/test_shell/mac/main.mm
+++ b/webkit/tools/test_shell/mac/main.mm
@@ -81,11 +81,11 @@ int main(const int argc, const char *argv[]) {
bool suppress_error_dialogs = (getenv("CHROME_HEADLESS") != NULL) ||
parsed_command_line.HasSwitch(test_shell::kNoErrorDialogs) ||
parsed_command_line.HasSwitch(test_shell::kLayoutTests);
- TestShell::InitLogging(suppress_error_dialogs);
-
bool layout_test_mode =
parsed_command_line.HasSwitch(test_shell::kLayoutTests);
bool interactive = !layout_test_mode;
+
+ TestShell::InitLogging(suppress_error_dialogs, layout_test_mode);
TestShell::InitializeTestShell(interactive);
bool no_tree = parsed_command_line.HasSwitch(test_shell::kNoTree);
@@ -250,7 +250,6 @@ int main(const int argc, const char *argv[]) {
continue;
SetCurrentTestName(filenameBuffer);
-
if (!TestShell::RunFileTest(filenameBuffer, params))
break;
}