Revert of Add mojo python bindings tests to the waterfalls.

scripts/slave/zip_build.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """ Creates a zip file in the staging dir with the result of a compile.
     It can be sent to other machines for testing.
 """
 
 import csv
@@ skipping 123 matching lines @@
       return r'^.+\.(a)$'
     else:
       return r'^.+\.(a|dSYM)$'
   if chromium_utils.IsLinux():
     # object files, archives, and gcc (make build) dependency info.
     return r'^.+\.(o|a|d)$'
 
   return '$NO_FILTER^'
 
 
-def _MojomFiles(build_dir, suffixes):
-  """Lists all mojom files that need to be included in the archive.
+def MojomJSFiles(build_dir):
+  """Lists all mojom JavaScript files that need to be included in the archive.
 
   Args:
     build_dir: The build directory.
 
   Returns:
-    A list of mojom file paths which are relative to the build
+    A list of mojom JavaScript file paths which are relative to the build
     directory.
   """
   walk_dirs = [
     'gen/mojo',
     'gen/content/test/data',
   ]
-  mojom_files = []
+  mojom_js_files = []
   for walk_dir in walk_dirs:
     walk_dir = os.path.join(build_dir, walk_dir)
     for path, _, files in os.walk(walk_dir):
       rel_path = os.path.relpath(path, build_dir)
-      for suffix in suffixes or []:
-        for mojom_file in fnmatch.filter(files, '*%s' % suffix):
-          mojom_files.append(os.path.join(rel_path, mojom_file))
-  return mojom_files
+      for mojom_js_file in fnmatch.filter(files, '*.mojom.js'):
+        mojom_js_files.append(os.path.join(rel_path, mojom_js_file))
+  return mojom_js_files
 
 
 def WriteRevisionFile(dirname, build_revision):
   """Writes a file containing revision number to given directory.
   Replaces the target file in place.
 
   Args:
     dirname: Directory to write the file in.
     build_revision: Revision number or hash.
 
@@ skipping 189 matching lines @@
 
   path_filter = PathMatcher(options)
   print path_filter
   print ('\nActually excluded: %s' %
          [f for f in root_files if not path_filter.Match(f)])
 
   zip_file_list = [f for f in root_files if path_filter.Match(f)]
 
   # TODO(yzshen): Once we have swarming support ready, we could use it to
   # archive run time dependencies of tests and remove this step.
-  mojom_files = _MojomFiles(build_dir, ['.mojom.js', '_mojom.py'])
-  print 'Include mojom files: %s' % mojom_files
-  zip_file_list.extend(mojom_files)
+  mojom_js_files = MojomJSFiles(build_dir)
+  print 'Include mojom JavaScript files: %s' % mojom_js_files
+  zip_file_list.extend(mojom_js_files)
 
   zip_file = MakeUnversionedArchive(build_dir, staging_dir, zip_file_list,
                                     unversioned_base_name, options.path_filter)
 
   zip_base, zip_ext, versioned_file = MakeVersionedArchive(
       zip_file, version_suffix, options)
 
   prune_limit = max(0, int(options.factory_properties.get('prune_limit', 10)))
   PruneOldArchives(staging_dir, zip_base, zip_ext, prune_limit=prune_limit)
 
@@ skipping 83 matching lines @@
   if options.path_filter:
     options.path_filter = PATH_FILTERS[options.path_filter](
         build_directory.GetBuildOutputDirectory(cros_board=options.cros_board),
         options.target)
 
   return Archive(options)
 
 
 if '__main__' == __name__:
   sys.exit(main(sys.argv))