Attachment 346776 Details for Bug 188392 – Patch

[patch] Patch

bug-188392-20180808105955.patch (text/plain), 1.93 KB, created by Ross Kirsling on 2018-08-08 10:59:56 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ross Kirsling

Created: 2018-08-08 10:59:56 PDT

Size: 1.93 KB

patch

obsolete

>Subversion Revision: 234698
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 5beae2a31bd37f2cfddf518eb8684bae1b306128..dde4c3526df6ac7b9778157043dd1e36e99a931f 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-08-08  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        run-builtins-generator-tests does not correctly handle CRLFs from stderr
>+        https://bugs.webkit.org/show_bug.cgi?id=188392
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Background:
>+        file.write converts LF to os.linesep, so if the input string contains CRLF, we end up writing CRCRLF to the file.
>+
>+        * Scripts/webkitpy/common/system/executive.py:
>+        (Executive.run_command):
>+        Normalize CRLF to LF in decoded stdout/stderr data, so that we don't return consumers a platform-specific string.
>+
> 2018-08-08  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [iOS] fast/events/ios/contenteditable-autocapitalize.html is a flaky failure
>diff --git a/Tools/Scripts/webkitpy/common/system/executive.py b/Tools/Scripts/webkitpy/common/system/executive.py
>index 82a01ca8205675935a3531950abefd3180dad5e9..44db3c1924b2487385953ae368df4059f5b2c6db 100644
>--- a/Tools/Scripts/webkitpy/common/system/executive.py
>+++ b/Tools/Scripts/webkitpy/common/system/executive.py
>@@ -386,9 +386,9 @@ class Executive(AbstractExecutive):
>                              close_fds=self._should_close_fds())
>         output = process.communicate(string_to_communicate)[0]
> 
>-        # run_command automatically decodes to unicode() unless explicitly told not to.
>+        # run_command automatically decodes to unicode() and converts CRLF to LF unless explicitly told not to.
>         if decode_output:
>-            output = output.decode(self._child_process_encoding())
>+            output = output.decode(self._child_process_encoding()).replace('\r\n', '\n')
> 
>         # wait() is not threadsafe and can throw OSError due to:
>         # http://bugs.python.org/issue1731717

Actions: View | Formatted Diff | Diff

Attachments on bug 188392: 346736 | 346776