Add check to run-bindings-tests for excess files

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 78 matching lines @@
 
 
 class BindingsTests(object):
     def __init__(self, reset_results, test_python, verbose, executive):
         self.reset_results = reset_results
         self.test_python = test_python
         self.verbose = verbose
         self.executive = executive
         _, self.interface_dependencies_filename = provider.newtempfile()
         _, self.derived_sources_list_filename = provider.newtempfile()
+        # Generate output into the reference directory if resetting results, or
+        # a temp directory if not.
         if reset_results:
-            self.event_names_filename = os.path.join(reference_directory, 'EventInterfaces.in')
+            self.output_directory = reference_directory
         else:
-            _, self.event_names_filename = provider.newtempfile()
+            self.output_directory = provider.newtempdir()
+        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_pl(self, idl_file, output_directory):
+    def generate_from_idl_pl(self, idl_file):
         cmd = ['perl', '-w',
                '-Ibindings/scripts',
                '-Ibuild/scripts',
                '-Icore/scripts',
                '-I../../JSON/out/lib/perl5',
                'bindings/scripts/generate_bindings.pl',
                # idl include directories (path relative to generate-bindings.pl)
                '--include', '.',
-               '--outputDir', output_directory,
+               '--outputDir', self.output_directory,
                '--interfaceDependenciesFile', self.interface_dependencies_filename,
                '--idlAttributesFile', 'bindings/IDLExtendedAttributes.txt',
                idl_file]
         try:
             self.run_command(cmd)
         except ScriptError, e:
             print 'ERROR: generate_bindings.pl: ' + os.path.basename(idl_file)
             print e.output
             return e.exit_code
         return 0
@@ skipping 54 matching lines @@
         if self.reset_results and self.verbose:
             print 'Reset results: EventInterfaces.in'
         try:
             self.run_command(cmd)
         except ScriptError, e:
             print 'ERROR: compute_dependencies.py'
             print e.output
             return e.exit_code
         return 0
 
-    def identical_file(self, reference_filename, work_filename):
+    def identical_file(self, reference_filename, output_filename):
         reference_basename = os.path.basename(reference_filename)
         cmd = ['diff',
                '-u',
                '-N',
                reference_filename,
-               work_filename]
+               output_filename]
         try:
             self.run_command(cmd)
         except ScriptError, e:
             # run_command throws an exception on diff (b/c non-zero exit code)
             print 'FAIL: %s' % reference_basename
             print e.output
             return False
 
         if self.verbose:
             print 'PASS: %s' % reference_basename
         return True
 
-    def identical_output_directory(self, work_directory):
+    def identical_output_files(self, output_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)
+                       os.path.join(output_directory, output_file))
+                      for output_file in os.listdir(output_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])
+        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))
+        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
 
     def run_tests(self):
         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(directory, idl_filename)
-            if self.generate_from_idl_pl(idl_path, work_directory):
+            if self.generate_from_idl_pl(idl_path):
                 return False
             if self.reset_results:
                 if self.verbose:
                     print 'Reset results: %s' % input_file
                 return True
-            return self.identical_output_directory(work_directory)
+            return self.identical_output_files(self.output_directory)
 
         def generate_and_check_output_py(idl_filename):
             if idl_filename in SKIP_PYTHON:
                 if self.verbose:
                     print 'SKIP: %s' % idl_filename
                 return True
-            work_directory = provider.newtempdir()
+            output_directory_py = provider.newtempdir()
             idl_path = os.path.join(input_directory, idl_filename)
-            if self.generate_from_idl_py(idl_path, work_directory):
+            if self.generate_from_idl_py(idl_path, output_directory_py):
                 return False
             # Detect changes
-            return self.identical_output_directory(work_directory)
+            return self.identical_output_files(output_directory_py)
 
         if self.reset_results:
             passed = True
         else:
             passed = self.identical_file(reference_event_names_filename,
                                          self.event_names_filename)
         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')])
+        passed &= self.no_excess_files()
         if self.test_python:
             if self.verbose:
                 print
                 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()
         if all_tests_passed:
             if self.verbose:
                 print
                 print PASS_MESSAGE
             return 0
         print
         print FAIL_MESSAGE
         return -1