- Collect stderr separately from stdout and append it to the layout test output.

- Write #EOF to stderr at the end of each test so it doesn't block.
- Disable "DidStopLoading called while not loading" and "DidStartLoading called
while loading" errors temporarily so the ~165 tests that
give those errors can still be run while we fix the underlying problem.
- Update Windows test list accordingly.  stderr was always being included on
Mac, so these tests shouldn't have changed state there.

BUG=3937
TEST=covered by layout tests
Review URL: http://codereview.chromium.org/8778

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5183 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 2 deletions

diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 4eff32f..a7ee633 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -82,7 +82,13 @@ void TestWebViewDelegate::OpenURL(WebView* webview, const GURL& url,
 
 void TestWebViewDelegate::DidStartLoading(WebView* webview) {
   if (page_is_loading_) {
-    LOG(ERROR) << "DidStartLoading called while loading";
+    // When we started including stderr in layout-test output, a number of
+    // number of tests began failing. The vast majority of the new failures
+    // were due to either this error message or the one in DidStopLoading.
+    // This is being disabled temporarily so we can keep running the tests.
+    // See http://code.google.com/p/chromium/issues/detail?id=3937
+    // TODO(pamg): Remove this when the underlying bug is fixed.
+    //LOG(ERROR) << "DidStartLoading called while loading";
     return;
   }
   page_is_loading_ = true;
@@ -90,7 +96,13 @@ void TestWebViewDelegate::DidStartLoading(WebView* webview) {
 
 void TestWebViewDelegate::DidStopLoading(WebView* webview) {
   if (!page_is_loading_) {
-    LOG(ERROR) << "DidStopLoading called while not loading";
+    // When we started including stderr in layout-test output, a number of
+    // number of tests began failing. The vast majority of the new failures
+    // were due to either this error message or the one in DidStartLoading.
+    // This is being disabled temporarily so we can keep running the tests.
+    // See http://code.google.com/p/chromium/issues/detail?id=3937
+    // TODO(pamg): Remove this when the underlying bug is fixed.
+    //LOG(ERROR) << "DidStopLoading called while not loading";
     return;
   }
   page_is_loading_ = false;