Changeset 58054 in webkit

Timestamp:

Apr 21, 2010 10:40:48 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-21 Eric Seidel <​eric@webkit.org>

Unreviewed. Attempt one more time to fix NRWT for chromium.

REGRESSION(57531): the commit-queue still hates Tor Arne Vestbø
​https://bugs.webkit.org/show_bug.cgi?id=37765

• Scripts/webkitpy/layout_tests/port/chromium.py:
  • Fix handling of test_shell output so that we always decode it as utf-8. Unlike DumpRenderTree test_shell does not ever return pixel data. It spits out the pixel dumps in a separate file, thus all output over stdout is utf-8 text.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-21  Eric Seidel  <eric@webkit.org>
+
+        Unreviewed.  Attempt one more time to fix NRWT for chromium.
+
+        REGRESSION(57531): the commit-queue still hates Tor Arne Vestbø
+        https://bugs.webkit.org/show_bug.cgi?id=37765
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+         - Fix handling of test_shell output so that we always
+           decode it as utf-8.
+           Unlike DumpRenderTree test_shell does not ever return
+           pixel data.  It spits out the pixel dumps in a separate
+           file, thus all output over stdout is utf-8 text.
+
 2010-04-21  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py

@@ -330 +330 @@
             self._proc.stdin.write(cmd)
             line = self._proc.stdout.readline()
+            # As far as I can tell, all output from test_shell
+            # is text output, thus we know it's all utf-8.
+            line = line.decode("utf-8")
         except IOError, e:
             _log.error("IOError communicating w/ test_shell: " + str(e))