Update run-bindings-tests per compute_interfaces_info split

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 21 matching lines @@
 
 from webkitpy.common.system.executive import Executive
 
 # Source/ path is needed both to find input IDL files, and to import other
 # Python modules.
 module_path = os.path.dirname(__file__)
 source_path = os.path.normpath(os.path.join(module_path, os.pardir, os.pardir,
                                             os.pardir, os.pardir, 'Source'))
 sys.path.append(source_path)  # for Source/bindings imports
 
-from bindings.scripts.compute_interfaces_info import compute_interfaces_info, interfaces_info
+import bindings.scripts.compute_interfaces_info_individual
+from bindings.scripts.compute_interfaces_info_individual import compute_info_individual, info_individual
+import bindings.scripts.compute_interfaces_info_overall
+from bindings.scripts.compute_interfaces_info_overall import compute_interfaces_info_overall, interfaces_info
 from bindings.scripts.idl_compiler import IdlCompilerV8
 
 
 PASS_MESSAGE = 'All tests PASS!'
 FAIL_MESSAGE = """Some tests FAIL!
 To update the reference files, execute:
     run-bindings-tests --reset-results
 
 If the failures are not due to your changes, test results may be out of sync;
 please rebaseline them in a separate CL, after checking that tests fail in ToT.
@@ skipping 44 matching lines @@
     # 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.
-    compute_interfaces_info(idl_paths_recursive(source_path))
+
+    # 2-stage computation: individual, then overall
+    for idl_filename in idl_paths_recursive(source_path):
+        compute_info_individual(idl_filename)
+    info_individuals = [info_individual()]
+    compute_interfaces_info_overall(info_individuals)
 
 
 def bindings_tests(output_directory, verbose):
     executive = Executive()
 
     def diff(filename1, filename2):
         # Python's difflib module is too slow, especially on long output, so
         # run external diff(1) command
         cmd = ['diff',
                '-u',  # unified format
@@ skipping 92 matching lines @@
 
 
 def run_bindings_tests(reset_results, verbose):
     # Generate output into the reference directory if resetting results, or
     # a temp directory if not.
     if reset_results:
         print 'Resetting results'
         return bindings_tests(reference_directory, verbose)
     with TemporaryDirectory() as temp_dir:
         return bindings_tests(temp_dir, verbose)