From dc910df9051091496e92998c6b5abf4afccbe882 Mon Sep 17 00:00:00 2001 From: "sgk@google.com" Date: Thu, 7 Aug 2008 14:16:31 +0000 Subject: 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 --- webkit/tools/layout_tests/layout_package/test_shell_thread.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'webkit/tools') 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 -- cgit v1.1