Attachment 346736 Details for Bug 188392 – Patch

[patch] Patch

bug-188392-20180807150100.patch (text/plain), 1.64 KB, created by Ross Kirsling on 2018-08-07 15:01:01 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ross Kirsling

Created: 2018-08-07 15:01:01 PDT

Size: 1.64 KB

patch

obsolete

>Subversion Revision: 234670
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index cb0e5cb1fa067e95d05ff3e8d6eb5e555fcc3b24..7d79fb532703f76b20fd64a0c61e8c498035d44e 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-08-07  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!).
>+
>+        * Scripts/webkitpy/codegen/main.py:
>+        (BuiltinsGeneratorTests.write_error_file):
>+
> 2018-08-07  Lucas Forschler  <lforschler@apple.com>
> 
>         If there's a Radar in the ChangeLog, webkit-patch upload/create-bug should put the radar in the bug and set InRadar
>diff --git a/Tools/Scripts/webkitpy/codegen/main.py b/Tools/Scripts/webkitpy/codegen/main.py
>index d6e7b6b6cc1c16e34d11b593614e097678a6bfe0..06e230a26c8a5861becf34b4ed9aa6cd19f59455 100644
>--- a/Tools/Scripts/webkitpy/codegen/main.py
>+++ b/Tools/Scripts/webkitpy/codegen/main.py
>@@ -26,6 +26,7 @@
> import os
> import os.path
> import shutil
>+import sys
> import tempfile
> from webkitpy.common.checkout.scm.detection import detect_scm_system
> from webkitpy.common.system.executive import ScriptError
>@@ -65,6 +66,9 @@ class BuiltinsGeneratorTests:
>     def write_error_file(self, input_filepath, output_directory, error_output):
>         output_filepath = os.path.join(output_directory, os.path.basename(input_filepath) + '-error')
> 
>+        if sys.platform == 'win32':
>+            error_output = error_output.replace('\r\n', '\n')
>+
>         with open(output_filepath, "w") as output_file:
>             output_file.write(error_output)
>

Actions: View | Formatted Diff | Diff

Attachments on bug 188392: 346736 | 346776