Changeset 112594 in webkit

Timestamp:

Mar 29, 2012 3:53:28 PM (12 years ago)

Author:

dpranke@chromium.org

Message:

new-run-webkit-tests: crashes when it fails to decode a stack trace
​https://bugs.webkit.org/show_bug.cgi?id=82673

Unreviewed, build fix.

We are assuming the stdout/stderr output from the driver is utf-8
encoded when we get stack traces; this may not be a valid
assumption generally, but if we do get strings that aren't valid
utf-8, we would crash. Now we will ignore any decoding errors.

• Scripts/webkitpy/layout_tests/port/base.py:

(Port._get_crash_log):

• Scripts/webkitpy/layout_tests/port/port_testcase.py:

(PortTestCase.test_get_crash_log):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2012-03-29  Dirk Pranke  <dpranke@chromium.org>
+
+        new-run-webkit-tests: crashes when it fails to decode a stack trace
+        https://bugs.webkit.org/show_bug.cgi?id=82673
+
+        Unreviewed, build fix.
+
+        We are assuming the stdout/stderr output from the driver is utf-8
+        encoded when we get stack traces; this may not be a valid
+        assumption generally, but if we do get strings that aren't valid
+        utf-8, we would crash. Now we will ignore any decoding errors.
+
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        (Port._get_crash_log):
+        * Scripts/webkitpy/layout_tests/port/port_testcase.py:
+        (PortTestCase.test_get_crash_log):
+
 2012-03-29  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py

@@ -1055 +1055 @@
         name_str = name or '<unknown process name>'
         pid_str = str(pid or '<unknown>')
-        stdout_lines = (stdout or '<empty>').decode('utf8').splitlines()
-        stderr_lines = (stderr or '<empty>').decode('utf8').splitlines()
+        stdout_lines = (stdout or '<empty>').decode('utf8', 'replace').splitlines()
+        stderr_lines = (stderr or '<empty>').decode('utf8', 'replace').splitlines()
         return 'crash log for %s (pid %s):\n%s\n%s\n' % (name_str, pid_str,
             '\n'.join(('STDOUT: ' + l) for l in stdout_lines),

trunk/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py

@@ -315 +315 @@
             'STDERR: <empty>\n'))
 
+        self.assertEquals(port._get_crash_log('foo', 1234, 'out bar\nout baz', 'err bar\nerr baz\n'),
+            ('crash log for foo (pid 1234):\n'
+             'STDOUT: out bar\n'
+             'STDOUT: out baz\n'
+             'STDERR: err bar\n'
+             'STDERR: err baz\n'))
+
+        self.assertEquals(port._get_crash_log('foo', 1234, 'foo\xa6bar', 'foo\xa6bar'),
+            (u'crash log for foo (pid 1234):\n'
+             u'STDOUT: foo\ufffdbar\n'
+             u'STDERR: foo\ufffdbar\n'))
+
 
 # FIXME: This class and main() should be merged into test-webkitpy.