Modified: trunk/Tools/ChangeLog (234725 => 234726)
--- trunk/Tools/ChangeLog 2018-08-09 15:49:13 UTC (rev 234725)
+++ trunk/Tools/ChangeLog 2018-08-09 17:24:39 UTC (rev 234726)
@@ -1,3 +1,12 @@
+2018-08-09 Ross Kirsling <[email protected]>
+
+ Unreviewed follow-up fix for r234720.
+
+ * Scripts/webkitpy/bindings/main.py:
+ (BindingsTests.close_and_remove):
+ (BindingsTests.main):
+ Return to the original approach, since this seems to be the simplest cross-platform solution.
+
2018-08-09 Ali Juma <[email protected]>
Import WPTs for IntersectionObserver
Modified: trunk/Tools/Scripts/webkitpy/bindings/main.py (234725 => 234726)
--- trunk/Tools/Scripts/webkitpy/bindings/main.py 2018-08-09 15:49:13 UTC (rev 234725)
+++ trunk/Tools/Scripts/webkitpy/bindings/main.py 2018-08-09 17:24:39 UTC (rev 234726)
@@ -169,6 +169,10 @@
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,21 +180,32 @@
all_tests_passed = True
input_directory = os.path.join('WebCore', 'bindings', 'scripts', 'test')
- 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):
+ 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.')
+ 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.name):
+ if not self.run_tests(generator, input_directory, reference_directory, supplemental_dependency_file[1]):
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)
+
if self.json_file_name:
json_data = {
'failures': self.failures,
