Update run-bindings-tests per compute_interfaces_info split

Source/bindings/scripts/compute_interfaces_info_overall.py

 #!/usr/bin/python
 #
 # Copyright (C) 2013 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:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
@@ skipping 114 matching lines @@
     Needed for merging partial_interface_files across components.
     """
     for key, value in other.iteritems():
         if key not in existing:
             existing[key] = value
             continue
         existing_value = existing[key]
         for inner_key, inner_value in value.iteritems():
             existing_value[inner_key].extend(inner_value)
 
+
 ################################################################################
 # Computations
 ################################################################################
 
+def read_interfaces_info(interfaces_info_individual_filenames):
+    # Read in individual info from files
+    for interfaces_info_individual_filename in interfaces_info_individual_filenames:
+        with open(interfaces_info_individual_filename) as interfaces_info_individual_file:
+            yield pickle.load(interfaces_info_individual_file)
+
 
 def compute_inheritance_info(interface_name):
     """Compute inheritance information, namely ancestors and inherited extended attributes."""
     def generate_ancestors(interface_name):
         while interface_name in parent_interfaces:
             interface_name = parent_interfaces[interface_name]
             yield interface_name
 
     ancestors = list(generate_ancestors(interface_name))
     inherited_extended_attributes = inherited_extended_attributes_by_interface[interface_name]
     for ancestor in ancestors:
         # Ancestors may not be present, notably if an ancestor is a generated
         # IDL file and we are running this script from run-bindings-tests,
         # where we don't generate these files.
         ancestor_extended_attributes = inherited_extended_attributes_by_interface.get(ancestor, {})
         inherited_extended_attributes.update(ancestor_extended_attributes)
 
     interfaces_info[interface_name].update({
         'ancestors': ancestors,
         'inherited_extended_attributes': inherited_extended_attributes,
     })
 
 
-def compute_interfaces_info_overall(interfaces_info_individual_filenames):
+def compute_interfaces_info_overall(info_individuals):
     """Compute information about IDL files.
 
     Information is stored in global interfaces_info.
     """
-    # Read in individual info from files
-    for interfaces_info_individual_filename in interfaces_info_individual_filenames:
-        with open(interfaces_info_individual_filename) as interfaces_info_individual_file:
-            info = pickle.load(interfaces_info_individual_file)
-            # No overlap between interface names, so ok to use dict.update
-            interfaces_info.update(info['interfaces_info'])
-            # Interfaces in one component may have partial interfaces in
-            # another component. This is ok (not a layering violation), since
-            # partial interfaces are used to *extend* interfaces.
-            # We thus need to update or append if already present
-            dict_of_dicts_of_lists_update_or_append(
-                    partial_interface_files, info['partial_interface_files'])
+    for info in info_individuals:
+        # No overlap between interface names, so ok to use dict.update
+        interfaces_info.update(info['interfaces_info'])
+        # Interfaces in one component may have partial interfaces in
+        # another component. This is ok (not a layering violation), since
+        # partial interfaces are used to *extend* interfaces.
+        # We thus need to update or append if already present
+        dict_of_dicts_of_lists_update_or_append(
+                partial_interface_files, info['partial_interface_files'])
 
     # Record inheritance information individually
     for interface_name, interface_info in interfaces_info.iteritems():
         extended_attributes = interface_info['extended_attributes']
         inherited_extended_attributes_by_interface[interface_name] = dict(
                 (key, value)
                 for key, value in extended_attributes.iteritems()
                 if key in INHERITED_EXTENDED_ATTRIBUTES)
         parent = interface_info['parent']
         if parent:
@@ skipping 59 matching lines @@
         del interface_info['is_legacy_treat_as_partial_interface']
         del interface_info['parent']
 
 
 ################################################################################
 
 def main():
     options, args = parse_options()
     # args = Input1, Input2, ..., Output
     interfaces_info_filename = args.pop()
+    info_individuals = read_interfaces_info(args)
 
-    compute_interfaces_info_overall(args)
+    compute_interfaces_info_overall(info_individuals)
     write_pickle_file(interfaces_info_filename,
                       interfaces_info,
                       options.write_file_only_if_changed)
 
 
 if __name__ == '__main__':
     sys.exit(main())