Support partial interface for test support idls

Tools/Scripts/webkitpy/bindings/main.py

 # Copyright (C) 2011 Google Inc.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
@@ skipping 35 matching lines @@
     'TestNode.idl',
     'TestObject.idl',
     'TestOverloadedConstructors.idl',
     'TestPartialInterface.idl',
     'TestSerializedScriptValueInterface.idl',
     'TestTypedArray.idl',
     'TestTypedefs.idl',
 ])
 
 input_directory = os.path.join('bindings', 'tests', 'idls')
+support_input_directory = os.path.join('bindings', 'tests', 'idls', 'testing')
 reference_directory = os.path.join('bindings', 'tests', 'results')
 reference_event_names_filename = os.path.join(reference_directory, 'EventInterfaces.in')
 
 
 class ScopedTempFileProvider(object):
     def __init__(self):
         self.files = []
         self.directories = []
 
     def __del__(self):
@@ skipping 14 matching lines @@
 
 provider = ScopedTempFileProvider()
 
 
 class BindingsTests(object):
     def __init__(self, reset_results, test_python, executive):
         self.reset_results = reset_results
         self.test_python = test_python
         self.executive = executive
         _, self.interface_dependencies_filename = provider.newtempfile()
+        _, self.derived_sources_list_filename = provider.newtempfile()
         if reset_results:
             self.event_names_filename = os.path.join(reference_directory, 'EventInterfaces.in')
         else:
             _, self.event_names_filename = provider.newtempfile()
 
     def run_command(self, cmd):
         return self.executive.run_command(cmd)
 
     def generate_from_idl_pl(self, idl_file, output_directory):
         cmd = ['perl', '-w',
@@ skipping 28 matching lines @@
         try:
             output = self.run_command(cmd)
         except ScriptError, e:
             print e.output
             return e.exit_code
         if output:
             print output
         return 0
 
     def generate_interface_dependencies(self):
-        idl_files_list_file, idl_files_list_filename = provider.newtempfile()
+        idl_files_list_file, main_idl_files_list_filename = provider.newtempfile()
         idl_paths = [os.path.join(input_directory, input_file)
                      for input_file in os.listdir(input_directory)
                      if input_file.endswith('.idl')]
         idl_files_list_contents = ''.join(idl_path + '\n'
                                           for idl_path in idl_paths)
         os.write(idl_files_list_file, idl_files_list_contents)
+        support_idl_files_list_file, support_idl_files_list_filename = provider.newtempfile()
+        idl_paths = [os.path.join(support_input_directory, input_file)

[Nils Barth (inactive), 2013/10/08 02:11:18]

Could you call this 'support_idl_paths'?
(Prefer single assignment.)

[kihong, 2013/10/10 04:33:57]

Done.

+                     for input_file in os.listdir(support_input_directory)
+                     if input_file.endswith('.idl')]
+        idl_files_list_contents = ''.join(idl_path + '\n'

[Nils Barth (inactive), 2013/10/08 02:11:18]

...and this 'support_idl_files_list_contents'?

[kihong, 2013/10/10 04:33:57]

Done.

+                                          for idl_path in idl_paths)
+        os.write(support_idl_files_list_file, idl_files_list_contents)
 
         # Dummy files, required by compute_dependencies but not checked
         _, window_constructors_file = provider.newtempfile()
         _, workerglobalscope_constructors_file = provider.newtempfile()
         _, sharedworkerglobalscope_constructors_file = provider.newtempfile()
         _, dedicatedworkerglobalscope_constructors_file = provider.newtempfile()
         cmd = ['python',
                'bindings/scripts/compute_dependencies.py',
-               '--idl-files-list', idl_files_list_filename,
+               '--main-idl-files-list', main_idl_files_list_filename,
+               '--support-idl-files-list', support_idl_files_list_filename,
                '--interface-dependencies-file', self.interface_dependencies_filename,
+               '--bindings-derived-sources-file', self.derived_sources_list_filename,
                '--window-constructors-file', window_constructors_file,
                '--workerglobalscope-constructors-file', workerglobalscope_constructors_file,
                '--sharedworkerglobalscope-constructors-file', sharedworkerglobalscope_constructors_file,
                '--dedicatedworkerglobalscope-constructors-file', dedicatedworkerglobalscope_constructors_file,
                '--event-names-file', self.event_names_filename,
                '--write-file-only-if-changed', '0']
 
         if self.reset_results:
             print 'Reset results: EventInterfaces.in'
         try:
@@ skipping 28 matching lines @@
     def identical_output_directory(self, work_directory):
         file_pairs = [(os.path.join(reference_directory, output_file),
                        os.path.join(work_directory, output_file))
                       for output_file in os.listdir(work_directory)
                       # FIXME: add option to compiler to not generate tables
                       if output_file != 'parsetab.py']
         return all([self.identical_file(reference_filename, work_filename)
                     for (reference_filename, work_filename) in file_pairs])
 
     def run_tests(self):
-        def generate_and_check_output_pl(idl_filename):
+        def generate_and_check_output_pl(idl_filename, directory):
             # Generate output into the reference directory if resetting
             # results, or a temp directory if not.
             if self.reset_results:
                 work_directory = reference_directory
             else:
                 work_directory = provider.newtempdir()
-            idl_path = os.path.join(input_directory, idl_filename)
+            idl_path = os.path.join(directory, idl_filename)
             if self.generate_from_idl_pl(idl_path, work_directory):
                 return False
             if self.reset_results:
                 print 'Reset results: %s' % input_file
                 return True
             return self.identical_output_directory(work_directory)
 
         def generate_and_check_output_py(idl_filename):
             if idl_filename in SKIP_PYTHON:
                 print 'SKIP: %s' % idl_filename
                 return True
             work_directory = provider.newtempdir()
             idl_path = os.path.join(input_directory, idl_filename)
             if self.generate_from_idl_py(idl_path, work_directory):
                 return False
             # Detect changes
             return self.identical_output_directory(work_directory)
 
         if self.reset_results:
             passed = True
         else:
             passed = self.identical_file(reference_event_names_filename,
                                          self.event_names_filename)
-        passed &= all([generate_and_check_output_pl(input_file)
-                       for input_file in os.listdir(input_directory)
-                       if input_file.endswith('.idl')])
+        for directory in [input_directory, support_input_directory]:
+            passed &= all([generate_and_check_output_pl(input_file, directory)
+                           for input_file in os.listdir(directory)
+                           if input_file.endswith('.idl')])
         print
         if self.test_python:
             print 'Python:'
             passed &= all([generate_and_check_output_py(input_file)
                            for input_file in os.listdir(input_directory)
                            if input_file.endswith('.idl')])
         return passed
 
     def main(self):
         current_scm = detect_scm_system(os.curdir)
         os.chdir(os.path.join(current_scm.checkout_root, 'Source'))
 
         if self.generate_interface_dependencies():
             print 'Failed to generate interface dependencies file.'
             return -1
 
         all_tests_passed = self.run_tests()
         print
         if all_tests_passed:
             print 'All tests PASS!'
             return 0
         print 'Some tests FAIL! (To update the reference files, execute "run-bindings-tests --reset-results")'
         return -1