Attachment 346803 Details for Bug 188424 – Patch

[patch] Patch

bug-188424-20180808160952.patch (text/plain), 6.24 KB, created by Ross Kirsling on 2018-08-08 16:09:53 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ross Kirsling

Created: 2018-08-08 16:09:53 PDT

Size: 6.24 KB

patch

obsolete

>Subversion Revision: 234698
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 61c2db15b8b8ca5d9c8b2d3f66b75b3b98f1b39c..79fefbd1160d8384dd8f84106cdf8f4e1c8bcb16 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-08-08  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        run-bindings-tests is not Win32-compatible
>+        https://bugs.webkit.org/show_bug.cgi?id=188424
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * bindings/scripts/preprocessor.pm:
>+        (applyPreprocessor):
>+        Ensure that we fall back to cl.exe if CC env var is not set on Windows.
>+
> 2018-08-08  Sihui Liu  <sihui_liu@apple.com>
> 
>         Assertion failed in Webcore::Process::setIdentifier()
>diff --git a/Source/WebCore/bindings/scripts/preprocessor.pm b/Source/WebCore/bindings/scripts/preprocessor.pm
>index ee65da4aff40f93ef7e02fcd75e0a4f019face58..547e956f05aa93d81a702723e3f7b1d39f75bf66 100644
>--- a/Source/WebCore/bindings/scripts/preprocessor.pm
>+++ b/Source/WebCore/bindings/scripts/preprocessor.pm
>@@ -45,17 +45,11 @@ sub applyPreprocessor
> 
>     my @args = ();
>     if (!$preprocessor) {
>-        require Config;
>-        if ($ENV{CC}) {
>-            $preprocessor = $ENV{CC};
>-        } elsif (-x "/usr/bin/clang") {
>-            $preprocessor = "/usr/bin/clang";
>-        } else {
>-            $preprocessor = "/usr/bin/gcc";
>-        }
>         if ($Config::Config{"osname"} eq "MSWin32") {
>+            $preprocessor = $ENV{CC} || "cl";
>             push(@args, qw(/EP));
>         } else {
>+            $preprocessor = $ENV{CC} || (-x "/usr/bin/clang" ? "/usr/bin/clang" : "/usr/bin/gcc");
>             push(@args, qw(-E -P -x c++));
>         }
>     }
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 5beae2a31bd37f2cfddf518eb8684bae1b306128..9dcbef5215fb3624b3d5f00dee65bfc0f5e128ec 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-08-08  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        run-bindings-tests is not Win32-compatible
>+        https://bugs.webkit.org/show_bug.cgi?id=188424
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/webkitpy/bindings/main.py:
>+        (BindingsTests.close_and_remove):
>+        (BindingsTests.main):
>+        Stop leaking file descriptors. (See https://www.logilab.org/blogentry/17873 for details.)
>+
> 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/bindings/main.py b/Tools/Scripts/webkitpy/bindings/main.py
>index 3940687dd2658eea63080e28e074e266cd26ad4c..04cbd8505673bd5c6f2e9d7052081f12d66c44e2 100644
>--- a/Tools/Scripts/webkitpy/bindings/main.py
>+++ b/Tools/Scripts/webkitpy/bindings/main.py
>@@ -169,6 +169,10 @@ class BindingsTests:
> 
>         return passed
> 
>+    def close_and_remove(self, temporary_file):
>+        os.close(temporary_file[0])
>+        os.remove(temporary_file[1])
>+
>     def main(self):
>         current_scm = detect_scm_system(os.curdir)
>         os.chdir(os.path.join(current_scm.checkout_root, 'Source'))
>@@ -176,31 +180,31 @@ class BindingsTests:
>         all_tests_passed = True
> 
>         input_directory = os.path.join('WebCore', 'bindings', 'scripts', 'test')
>-        supplemental_dependency_file = tempfile.mkstemp()[1]
>-        window_constructors_file = tempfile.mkstemp()[1]
>-        workerglobalscope_constructors_file = tempfile.mkstemp()[1]
>-        dedicatedworkerglobalscope_constructors_file = tempfile.mkstemp()[1]
>-        serviceworkerglobalscope_constructors_file = tempfile.mkstemp()[1]
>-        if self.generate_supplemental_dependency(input_directory, supplemental_dependency_file, window_constructors_file, workerglobalscope_constructors_file, dedicatedworkerglobalscope_constructors_file, serviceworkerglobalscope_constructors_file):
>+        supplemental_dependency_file = tempfile.mkstemp()
>+        window_constructors_file = tempfile.mkstemp()
>+        workerglobalscope_constructors_file = tempfile.mkstemp()
>+        dedicatedworkerglobalscope_constructors_file = tempfile.mkstemp()
>+        serviceworkerglobalscope_constructors_file = tempfile.mkstemp()
>+        if self.generate_supplemental_dependency(input_directory, supplemental_dependency_file[1], window_constructors_file[1], workerglobalscope_constructors_file[1], dedicatedworkerglobalscope_constructors_file[1], serviceworkerglobalscope_constructors_file[1]):
>             print('Failed to generate a supplemental dependency file.')
>-            os.remove(supplemental_dependency_file)
>-            os.remove(window_constructors_file)
>-            os.remove(workerglobalscope_constructors_file)
>-            os.remove(dedicatedworkerglobalscope_constructors_file)
>-            os.remove(serviceworkerglobalscope_constructors_file)
>+            self.close_and_remove(supplemental_dependency_file)
>+            self.close_and_remove(window_constructors_file)
>+            self.close_and_remove(workerglobalscope_constructors_file)
>+            self.close_and_remove(dedicatedworkerglobalscope_constructors_file)
>+            self.close_and_remove(serviceworkerglobalscope_constructors_file)
>             return -1
> 
>         for generator in self.generators:
>             input_directory = os.path.join('WebCore', 'bindings', 'scripts', 'test')
>             reference_directory = os.path.join('WebCore', 'bindings', 'scripts', 'test', generator)
>-            if not self.run_tests(generator, input_directory, reference_directory, supplemental_dependency_file):
>+            if not self.run_tests(generator, input_directory, reference_directory, supplemental_dependency_file[1]):
>                 all_tests_passed = False
> 
>-        os.remove(supplemental_dependency_file)
>-        os.remove(window_constructors_file)
>-        os.remove(workerglobalscope_constructors_file)
>-        os.remove(dedicatedworkerglobalscope_constructors_file)
>-        os.remove(serviceworkerglobalscope_constructors_file)
>+        self.close_and_remove(supplemental_dependency_file)
>+        self.close_and_remove(window_constructors_file)
>+        self.close_and_remove(workerglobalscope_constructors_file)
>+        self.close_and_remove(dedicatedworkerglobalscope_constructors_file)
>+        self.close_and_remove(serviceworkerglobalscope_constructors_file)
> 
>         if self.json_file_name:
>             json_data = {

Actions: View | Formatted Diff | Diff

Attachments on bug 188424: 346803 | 346815 | 346820