Also shows detailed diffs on expected diffs.

tools/determinism/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 difflib
 import json
 import optparse
@@ skipping 607 matching lines @@
   print('Unexpected diffs: %d' % len(unexpected_diffs))
   if unexpected_diffs:
     print('Unexpected files with diffs:\n')
     for u in unexpected_diffs:
       print('  %s' % u)
   if unexpected_equals:
     print('Unexpected files with no diffs:\n')
     for u in unexpected_equals:
       print('  %s' % u)
 
-  if unexpected_diffs:
-    diffs_to_investigate = set(unexpected_diffs).difference(
+  if expected_diffs or unexpected_diffs:
+    all_diffs = expected_diffs + unexpected_diffs
+    diffs_to_investigate = set(all_diffs).difference(
         set(missing_files))
     compare_deps(first_dir, second_dir, diffs_to_investigate)

[Dirk Pranke, 2016/08/29 15:51:34]

Nit: You don't actually need the `if` check on line 628 at all; lines 629-632
will do the
right thing even if run unconditionally, so I would eliminate the branch.

[Yoshisato Yanagisawa, 2016/08/30 01:29:49]

done.
also removed unnecessary set(), and make diffs sorted.

 
   return int(bool(unexpected_diffs))
 
 
 def main():
   parser = optparse.OptionParser(usage='%prog [options]')
   parser.add_option(
       '-f', '--first-build-dir', help='The first build directory.')
   parser.add_option(
       '-s', '--second-build-dir', help='The second build directory.')
@@ skipping 14 matching lines @@
     parser.error('--target-platform is required')
 
   return compare_build_artifacts(os.path.abspath(options.first_build_dir),
                                  os.path.abspath(options.second_build_dir),
                                  options.target_platform,
                                  options.recursive)
 
 
 if __name__ == '__main__':
   sys.exit(main())