Clean up generate_event_interfaces.py

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 39 matching lines @@
     'TestImplements2.idl',
     'TestImplements3.idl',
     'TestPartialInterface.idl',
     'TestPartialInterfacePython.idl',
     'TestPartialInterfacePython2.idl',
 ])
 
 all_input_directory = '.'  # Relative to Source/
 test_input_directory = os.path.join('bindings', 'tests', 'idls')
 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.file_handles = []
         self.file_paths = []
         self.dir_paths = []
 
     def __enter__(self):
         return self
@@ skipping 26 matching lines @@
         self.verbose = verbose
         self.executive = executive.Executive()
         self.provider = provider
         _, self.interfaces_info_filename = provider.new_temp_file()
         # Generate output into the reference directory if resetting results, or
         # a temp directory if not.
         if reset_results:
             self.output_directory = reference_directory
         else:
             self.output_directory = provider.new_temp_dir()
-        self.event_names_filename = os.path.join(self.output_directory, 'EventInterfaces.in')
 
     def run_command(self, cmd):
         output = self.executive.run_command(cmd)
         if output:
             print output
 
     def generate_from_idl(self, idl_file):
         cmd = ['python',
                'bindings/scripts/idl_compiler.py',
                '--output-dir', self.output_directory,
@@ skipping 21 matching lines @@
                                  for filename in fnmatch.filter(files, '*.idl'))
             return idl_paths
 
         def write_list_file(idl_paths):
             list_file, list_filename = self.provider.new_temp_file()
             list_contents = ''.join(idl_path + '\n'
                                     for idl_path in idl_paths)
             os.write(list_file, list_contents)
             return list_filename
 
-        def generate_event_interfaces(event_names_filename):
-            cmd = ['python',
-                   'bindings/scripts/generate_event_interfaces.py',
-                   '--interfaces-info-file', self.interfaces_info_filename,
-                   '--event-names-file', event_names_filename,
-                   '--write-file-only-if-changed', '0']
-            self.run_command(cmd)
-
         def compute_interfaces_info(idl_files_list_filename):
             cmd = ['python',
                    'bindings/scripts/compute_interfaces_info.py',
                    '--idl-files-list', idl_files_list_filename,
                    '--interfaces-info-file', self.interfaces_info_filename,
                    '--write-file-only-if-changed', '0']
             self.run_command(cmd)
 
-        test_idl_files_list_filename = write_list_file(idl_paths(test_input_directory))
+        # We compute interfaces info for *all* IDL files, not just test IDL
+        # files, as code generator output depends on inheritance (both ancestor
+        # chain and inherited extended attributes), and some real interfaces
+        # are special-cased, such as Node.
+        #
+        # For example, when testing the behavior of interfaces that inherit
+        # from Node, we also need to know that these inherit from EventTarget,
+        # since this is also special-cased and Node inherits from EventTarget,
+        # but this inheritance information requires computing dependencies for
+        # the real Node.idl file.
         all_idl_files_list_filename = write_list_file(idl_paths_recursive(all_input_directory))
-
-        if self.reset_results and self.verbose:
-            print 'Reset results: EventInterfaces.in'
         try:
-            # We first compute interfaces info for testing files only,
-            # so we can compare EventInterfaces.in.
-            compute_interfaces_info(test_idl_files_list_filename)
-            generate_event_interfaces(self.event_names_filename)
-
-            # We then compute interfaces info for all IDL files, as code
-            # generator output depends on inheritance (both ancestor chain and
-            # inherited extended attributes), and some real interfaces are
-            # special-cased, such as Node.
-            # For example, when testing the behavior of interfaces that inherit
-            # from Node, we also need to know that these inherit from
-            # EventTarget, since this is also special-cased and Node inherits
-            # from EventTarget, but this inheritance information requires
-            # computing dependencies for the real Node.idl file.
-            #
-            # Don't overwrite the event names file generated for testing IDLs
             compute_interfaces_info(all_idl_files_list_filename)
         except ScriptError, e:
             print 'ERROR: compute_interfaces_info.py'
             print e.output
             return e.exit_code
         return 0
 
     def identical_file(self, reference_filename, output_filename):
         reference_basename = os.path.basename(reference_filename)
         cmd = ['diff',
@@ skipping 19 matching lines @@
                       for output_file in os.listdir(self.output_directory)
                       # Skip cache
                       if (output_file != 'parsetab.py' and  # PLY cache
                           not output_file.endswith('.cache'))]  # Jinja cache
         return all([self.identical_file(reference_filename, output_filename)
                     for (reference_filename, output_filename) in file_pairs])
 
     def no_excess_files(self):
         generated_files = set(os.listdir(self.output_directory))
         generated_files.add('.svn')  # Subversion working copy directory
-        generated_files.add('EventInterfaces.in')  # only in Perl, not Python
         excess_files = [output_file
                         for output_file in os.listdir(reference_directory)
                         if output_file not in generated_files]
         if excess_files:
             print ('Excess reference files! '
                   '(probably cruft from renaming or deleting):\n' +
                   '\n'.join(excess_files))
             return False
         return True
 
@@ skipping 11 matching lines @@
                     print 'DEPENDENCY: %s' % input_filename
                 continue
 
             idl_path = os.path.join(test_input_directory, input_filename)
             if self.generate_from_idl(idl_path):
                 return False
             if self.reset_results and self.verbose:
                 print 'Reset results: %s' % input_filename
 
         # Detect all changes
-        passed = self.identical_file(reference_event_names_filename,
-                                     self.event_names_filename)
-        passed &= self.identical_output_files()
+        passed = self.identical_output_files()
         passed &= self.no_excess_files()
         return passed
 
     def main(self):
         current_scm = detect_scm_system(os.curdir)
         os.chdir(os.path.join(current_scm.checkout_root, 'Source'))
 
         all_tests_passed = self.run_tests()
         if all_tests_passed:
             if self.verbose:
                 print
                 print PASS_MESSAGE
             return 0
         print
         print FAIL_MESSAGE
         return -1
 
 
 def run_bindings_tests(reset_results, verbose):
     with ScopedTempFileProvider() as provider:
         return BindingsTests(reset_results, verbose, provider).main()