Deterministic recipe: Print the number of files equals or differents

scripts/slave/recipe_modules/isolate/resources/compare_build_artifacts.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 """Compare the artifacts from two builds."""
 
 import filecmp
 import json
 import optparse
 import os
@@ skipping 35 matching lines @@
     blacklist = frozenset(json.load(f))
 
   res = 0
   first_list = get_files_to_compare(first_dir) - blacklist
   second_list = get_files_to_compare(second_dir) - blacklist
 
   diff = first_list.symmetric_difference(second_list)
   if diff:
     print >> sys.stderr, 'Different list of files in both directories'
     print >> sys.stderr, '\n'.join('  ' + i for i in sorted(diff))
-    res = 1
+    res += len(diff)
 
   for f in sorted(first_list & second_list):
     first_file = os.path.join(first_dir, f)
     second_file = os.path.join(second_dir, f)
     if filecmp.cmp(first_file, second_file, shallow=False):
       print('%s: equal' % f)
     else:
       print('%s: DIFFERENT' % f)
-      res = 1
+      res += 1
 
-  return res
+  print '%d files are equal, %d are different.'  % (
+      len(first_list & second_list), res)

[M-A Ruel, 2014/10/28 20:31:56]

calculation is wrong

[Sébastien Marchand, 2014/10/28 20:36:57]

Oops, forgot to save my changes before uploading...

+
+  return 0 if res == 0 else 1
 
 
 def main():
   parser = optparse.OptionParser(usage='%prog [options]')
   parser.add_option('--first-build-dir', help='The first build directory.')
   parser.add_option('--second-build-dir', help='The second build directory.')
   options, _ = parser.parse_args()
 
   if not options.first_build_dir:
     parser.error('--first-build-dir is required')
   if not options.second_build_dir:
     parser.error('--second-build-dir is required')
 
   return compare_build_artifacts(options.first_build_dir,
                                  options.second_build_dir)
 
 
 if __name__ == '__main__':
   sys.exit(main())