Title: [178651] trunk/Tools
Revision
178651
Author
a...@apple.com
Date
2015-01-19 10:05:00 -0800 (Mon, 19 Jan 2015)

Log Message

"Unknown option: sharedworkerglobalscopeconstructorsfile" when running bindings tests.
https://bugs.webkit.org/show_bug.cgi?id=140606

Reviewed by Csaba Osztrogonác.

* Scripts/webkitpy/bindings/main.py:
(BindingsTests.generate_supplemental_dependency):
(BindingsTests.main):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (178650 => 178651)


--- trunk/Tools/ChangeLog	2015-01-19 17:43:18 UTC (rev 178650)
+++ trunk/Tools/ChangeLog	2015-01-19 18:05:00 UTC (rev 178651)
@@ -1,3 +1,14 @@
+2015-01-19  Alexey Proskuryakov  <a...@apple.com>
+
+        "Unknown option: sharedworkerglobalscopeconstructorsfile" when running bindings tests.
+        https://bugs.webkit.org/show_bug.cgi?id=140606
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Scripts/webkitpy/bindings/main.py:
+        (BindingsTests.generate_supplemental_dependency):
+        (BindingsTests.main):
+
 2015-01-19  Carlos Garcia Campos  <cgar...@igalia.com>
 
         [GTK] [WK2] TestWebKitWebView snapshot fails

Modified: trunk/Tools/Scripts/webkitpy/bindings/main.py (178650 => 178651)


--- trunk/Tools/Scripts/webkitpy/bindings/main.py	2015-01-19 17:43:18 UTC (rev 178650)
+++ trunk/Tools/Scripts/webkitpy/bindings/main.py	2015-01-19 18:05:00 UTC (rev 178651)
@@ -62,7 +62,7 @@
             exit_code = e.exit_code
         return exit_code
 
-    def generate_supplemental_dependency(self, input_directory, supplemental_dependency_file, window_constructors_file, workerglobalscope_constructors_file, sharedworkerglobalscope_constructors_file, dedicatedworkerglobalscope_constructors_file):
+    def generate_supplemental_dependency(self, input_directory, supplemental_dependency_file, window_constructors_file, workerglobalscope_constructors_file, dedicatedworkerglobalscope_constructors_file):
         idl_files_list = tempfile.mkstemp()
         for input_file in os.listdir(input_directory):
             (name, extension) = os.path.splitext(input_file)
@@ -79,7 +79,6 @@
                '--supplementalDependencyFile', supplemental_dependency_file,
                '--windowConstructorsFile', window_constructors_file,
                '--workerGlobalScopeConstructorsFile', workerglobalscope_constructors_file,
-               '--sharedWorkerGlobalScopeConstructorsFile', sharedworkerglobalscope_constructors_file,
                '--dedicatedWorkerGlobalScopeConstructorsFile', dedicatedworkerglobalscope_constructors_file]
 
         exit_code = 0
@@ -157,14 +156,12 @@
         supplemental_dependency_file = tempfile.mkstemp()[1]
         window_constructors_file = tempfile.mkstemp()[1]
         workerglobalscope_constructors_file = tempfile.mkstemp()[1]
-        sharedworkerglobalscope_constructors_file = tempfile.mkstemp()[1]
         dedicatedworkerglobalscope_constructors_file = tempfile.mkstemp()[1]
-        if self.generate_supplemental_dependency(input_directory, supplemental_dependency_file, window_constructors_file, workerglobalscope_constructors_file, sharedworkerglobalscope_constructors_file, dedicatedworkerglobalscope_constructors_file):
+        if self.generate_supplemental_dependency(input_directory, supplemental_dependency_file, window_constructors_file, workerglobalscope_constructors_file, dedicatedworkerglobalscope_constructors_file):
             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(sharedworkerglobalscope_constructors_file)
             os.remove(dedicatedworkerglobalscope_constructors_file)
             return -1
 
@@ -177,7 +174,6 @@
         os.remove(supplemental_dependency_file)
         os.remove(window_constructors_file)
         os.remove(workerglobalscope_constructors_file)
-        os.remove(sharedworkerglobalscope_constructors_file)
         os.remove(dedicatedworkerglobalscope_constructors_file)
         print ''
         if all_tests_passed:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to