Attachment 346820 Details for Bug 188424 – Patch

[patch] Patch

bug-188424-20180808215242.patch (text/plain), 5.34 KB, created by Ross Kirsling on 2018-08-08 21:52:43 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ross Kirsling

Created: 2018-08-08 21:52:43 PDT

Size: 5.34 KB

patch

obsolete

>Subversion Revision: 234716
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index e33db1bf8c60c3379be67d7279a6d7f2da3f0c86..8fc14061342dc0be4b097da073f7b84655f93de1 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  Don Olmstead  <don.olmstead@sony.com>
> 
>         [Curl] Surface additional NetworkLoadMetrics
>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 22c3cc5e60f7a2998415dde23ada9e7b2e448481..c24bbc142413a8a74c90d1142464a6eb4b3ab76d 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.main):
>+        Stop leaking file descriptors.
>+        (See https://www.logilab.org/blogentry/17873 for details, though the solution here is even simpler.)
>+
> 2018-08-08  Alex Christensen  <achristensen@webkit.org>
> 
>         Fix possible null dereference in WebBackForwardList::restoreFromState
>diff --git a/Tools/Scripts/webkitpy/bindings/main.py b/Tools/Scripts/webkitpy/bindings/main.py
>index 3940687dd2658eea63080e28e074e266cd26ad4c..f8236db90ead3dc477b41db931901d81d4954a47 100644
>--- a/Tools/Scripts/webkitpy/bindings/main.py
>+++ b/Tools/Scripts/webkitpy/bindings/main.py
>@@ -176,32 +176,21 @@ 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.NamedTemporaryFile()
>+        window_constructors_file = tempfile.NamedTemporaryFile()
>+        workerglobalscope_constructors_file = tempfile.NamedTemporaryFile()
>+        dedicatedworkerglobalscope_constructors_file = tempfile.NamedTemporaryFile()
>+        serviceworkerglobalscope_constructors_file = tempfile.NamedTemporaryFile()
>+        if self.generate_supplemental_dependency(input_directory, supplemental_dependency_file.name, window_constructors_file.name, workerglobalscope_constructors_file.name, dedicatedworkerglobalscope_constructors_file.name, serviceworkerglobalscope_constructors_file.name):
>             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)
>             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.name):
>                 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)
>-
>         if self.json_file_name:
>             json_data = {
>                 'failures': self.failures,

Actions: View | Formatted Diff | Diff

Attachments on bug 188424: 346803 | 346815 | 346820