content/shell/shell_browser_main.cc - Issue 10941011: Rewrite layout_browsertests to use content_shell --dump-render-tree to execute layout tests

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/shell/shell_browser_main.cc

Issue 10941011: Rewrite layout_browsertests to use content_shell --dump-render-tree to execute layout tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: updates Created 8 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/browser/worker_host/test/worker_browsertest.cc ('K') | « content/shell/shell.cc ('k') | content/shell/shell_javascript_dialog_creator.cc » ('j') | content/test/layout_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/shell_browser_main.cc

diff --git a/content/shell/shell_browser_main.cc b/content/shell/shell_browser_main.cc

index eef7836a808958afbe5e598c495925c905927bb2..a19005de04cdb804dfc41751770b619309399b76 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;

}