diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-07 14:16:31 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-07 14:16:31 +0000 |
| commit | dc910df9051091496e92998c6b5abf4afccbe882 (patch) | |
| tree | ba11063cb756170abad90e9f377df00753315b67 /webkit | |
| parent | 50e431472ec1589884f2de2007a10718cb3d4176 (diff) | |
| download | chromium_src-dc910df9051091496e92998c6b5abf4afccbe882.zip chromium_src-dc910df9051091496e92998c6b5abf4afccbe882.tar.gz chromium_src-dc910df9051091496e92998c6b5abf4afccbe882.tar.bz2 | |
Combine stderr and stdout when running the webkit layout tests so we don't lose error messages on stderr.
This was causing font-face-unicode-range.html to fail, but we weren't detecting it because the messages on stderr were disappearing, making it look like a timeout and crash, instead of the explicit failure we were expecting.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@512 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/test_shell_thread.py | 5 |
1 files changed, 3 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 e28a30e..fb7ed3f 100644 --- a/webkit/tools/layout_tests/layout_package/test_shell_thread.py +++ b/webkit/tools/layout_tests/layout_package/test_shell_thread.py @@ -122,7 +122,7 @@ def StartTestShell(binary, args): return subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, - stderr=subprocess.PIPE) + stderr=subprocess.STDOUT) class SingleTestThread(threading.Thread): @@ -297,5 +297,6 @@ class TestShellThread(threading.Thread): if self._test_shell_proc: self._test_shell_proc.stdin.close() self._test_shell_proc.stdout.close() - self._test_shell_proc.stderr.close() + if self._test_shell_proc.stderr: + self._test_shell_proc.stderr.close() self._test_shell_proc = None |