diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 15:20:04 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 15:20:04 +0000 |
| commit | 118310616de7a8a6344aa46a7596b542e2329605 (patch) | |
| tree | 1848c6689bc1ec2c19969e7bc906904b37bf7551 /content/shell/shell_browser_main.cc | |
| parent | a55be12bd48805850f2a3404af9116b09b1c4ebb (diff) | |
| download | chromium_src-118310616de7a8a6344aa46a7596b542e2329605.zip chromium_src-118310616de7a8a6344aa46a7596b542e2329605.tar.gz chromium_src-118310616de7a8a6344aa46a7596b542e2329605.tar.bz2 | |
Rewrite layout_browsertests to use content_shell --dump-render-tree to execute layout tests
break down of changes
- refactor WebKitTestResultPrinter to print to a stream
- allow for swapping the result printer
- add testRunner.workerThreadCount implementation and testRunner.overridePreference stub
- rip out the fake testRunner and result getting / formatting code from InProcessBrowserLayoutTest
- make it use WebKitTestController to run the tests
- remove all the code for copying resources around (since we don't need to patch the tests, we can just read the original)
BUG=none
TEST=layout_browsertests passes
Review URL: https://chromiumcodereview.appspot.com/10941011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158803 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/shell_browser_main.cc')
| -rw-r--r-- | content/shell/shell_browser_main.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/content/shell/shell_browser_main.cc b/content/shell/shell_browser_main.cc index eef7836..a19005d 100644 --- a/content/shell/shell_browser_main.cc +++ b/content/shell/shell_browser_main.cc @@ -4,6 +4,8 @@ #include "content/shell/shell_browser_main.h" +#include <iostream> + #include "base/command_line.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" @@ -72,8 +74,8 @@ int ShellBrowserMain(const content::MainFunctionParams& parameters) { char test_string[2048]; #if defined(OS_ANDROID) - puts("#READY"); - fflush(stdout); + std::cout << "#READY\n"; + std::cout.flush(); #endif while (fgets(test_string, sizeof(test_string), stdin)) { @@ -96,9 +98,6 @@ int ShellBrowserMain(const content::MainFunctionParams& parameters) { main_runner_->Run(); - fflush(stdout); - fflush(stderr); - if (!content::WebKitTestController::Get()->ResetAfterLayoutTest()) break; } |