Changeset 247244 in webkit

Timestamp:

Jul 8, 2019 6:03:27 PM (5 years ago)

Author:

Fujii Hironori

Message:

JSTestGlobalObject.cpp of bindings-generation-tests is failing for Windows Python
​https://bugs.webkit.org/show_bug.cgi?id=199487

Reviewed by Ross Kirsling.

In Windows Python, preprocessor.pm is using cl.exe. cl.exe was
failing to open testglobalscope_constructors_file which was
created by using tempfile.mkstemp() because it keeps the file
open. Use tempfile.mkdtemp() to create temporary files in the
temporary directory instead of tempfile.mkstemp().

• Scripts/webkitpy/bindings/main.py:

(BindingsTests.run_tests):
(BindingsTests.main):
(BindingsTests.close_and_remove): Deleted.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/bindings/main.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-07-08  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        JSTestGlobalObject.cpp of bindings-generation-tests is failing for Windows Python
+        https://bugs.webkit.org/show_bug.cgi?id=199487
+
+        Reviewed by Ross Kirsling.
+
+        In Windows Python, preprocessor.pm is using cl.exe. cl.exe was
+        failing to open testglobalscope_constructors_file which was
+        created by using tempfile.mkstemp() because it keeps the file
+        open. Use tempfile.mkdtemp() to create temporary files in the
+        temporary directory instead of tempfile.mkstemp().
+
+        * Scripts/webkitpy/bindings/main.py:
+        (BindingsTests.run_tests):
+        (BindingsTests.main):
+        (BindingsTests.close_and_remove): Deleted.
+
 2019-07-08  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/Scripts/webkitpy/bindings/main.py

@@ -175 +175 @@
         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)
@@ -185 +181 @@
         all_tests_passed = True
 
+        work_directory = tempfile.mkdtemp()
         input_directory = os.path.join('WebCore', 'bindings', 'scripts', 'test')
-        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()
-        workletglobalscope_constructors_file = tempfile.mkstemp()
-        paintworkletglobalscope_constructors_file = tempfile.mkstemp()
-        testglobalscope_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], workletglobalscope_constructors_file[1], paintworkletglobalscope_constructors_file[1], testglobalscope_constructors_file[1]):
+        supplemental_dependency_file = os.path.join(work_directory, 'supplemental_dependency.tmp')
+        window_constructors_file = os.path.join(work_directory, 'DOMWindowConstructors.idl')
+        workerglobalscope_constructors_file = os.path.join(work_directory, 'WorkerGlobalScopeConstructors.idl')
+        dedicatedworkerglobalscope_constructors_file = os.path.join(work_directory, 'DedicatedWorkerGlobalScopeConstructors.idl')
+        serviceworkerglobalscope_constructors_file = os.path.join(work_directory, 'ServiceWorkerGlobalScopeConstructors.idl')
+        workletglobalscope_constructors_file = os.path.join(work_directory, 'WorkletGlobalScopeConstructors.idl')
+        paintworkletglobalscope_constructors_file = os.path.join(work_directory, 'PaintWorkletGlobalScopeConstructors.idl')
+        testglobalscope_constructors_file = os.path.join(work_directory, 'BindingTestGlobalConstructors.idl')
+        if self.generate_supplemental_dependency(input_directory, supplemental_dependency_file, window_constructors_file, workerglobalscope_constructors_file, dedicatedworkerglobalscope_constructors_file, serviceworkerglobalscope_constructors_file, workletglobalscope_constructors_file, paintworkletglobalscope_constructors_file, testglobalscope_constructors_file):
             print('Failed to generate a supplemental dependency 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)
-            self.close_and_remove(workletglobalscope_constructors_file)
-            self.close_and_remove(paintworkletglobalscope_constructors_file)
-            self.close_and_remove(testglobalscope_constructors_file)
+            shutil.rmtree(work_directory)
             return -1
 
@@ -209 +199 @@
             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[1]):
+            if not self.run_tests(generator, input_directory, reference_directory, supplemental_dependency_file):
                 all_tests_passed = False
 
-        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)
-        self.close_and_remove(workletglobalscope_constructors_file)
-        self.close_and_remove(paintworkletglobalscope_constructors_file)
-        self.close_and_remove(testglobalscope_constructors_file)
+        shutil.rmtree(work_directory)
 
         if self.json_file_name: