summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-11 21:46:04 +0000
committerpamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-11 21:46:04 +0000
commite77ea34b5c0bef7f64399256968263058d6b24f2 (patch)
tree706b2cbc2c684f7c9f4cbb02a8bca0d12257db45
parent1cb2fd05c92b9c17b95c34307e594a4f0248b5e2 (diff)
downloadchromium_src-e77ea34b5c0bef7f64399256968263058d6b24f2.zip
chromium_src-e77ea34b5c0bef7f64399256968263058d6b24f2.tar.gz
chromium_src-e77ea34b5c0bef7f64399256968263058d6b24f2.tar.bz2
Don't output empty stderr lines. This will hopefully solve the MemoryError
problems seen in http/tests/misc/object-image-error-with-onload.html in a Debug run. TBR=ojan BUG=none TEST=covered by layout tests Review URL: http://codereview.chromium.org/10607 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5206 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/layout_tests/layout_package/test_shell_thread.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/layout_package/test_shell_thread.py b/webkit/tools/layout_tests/layout_package/test_shell_thread.py
index f8864f0..466d7d7 100644
--- a/webkit/tools/layout_tests/layout_package/test_shell_thread.py
+++ b/webkit/tools/layout_tests/layout_package/test_shell_thread.py
@@ -86,8 +86,10 @@ def ProcessOutput(proc, filename, test_uri, test_types, test_args):
# the tests deterministically until someone has a chance to fix the
# underlying problem.
# See http://code.google.com/p/chromium/issues/detail?id=4285
- if not line.endswith('alias ISO-8859-8-I maps to ISO-8859-8-I already, but'
- ' someone is trying to make it map to ISO-8859-8'):
+ if (line != '' and
+ not line.endswith('alias ISO-8859-8-I maps to ISO-8859-8-I already, '
+ 'but someone is trying to make it map to '
+ 'ISO-8859-8')):
outlines.append(line)
line = proc.stderr.readline()