Deterministic recipe: Print the list of files for which zap_timestamp failed.

scripts/slave/recipe_modules/isolate/resources/remove_build_metadata.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.
 """Remove the build metadata embedded in the artifacts of a build."""
 
 import json
 import optparse
 import os
 import subprocess
@@ skipping 10 matching lines @@
   return subprocess.call([zap_timestamp_exe, filename])
 
 
 def RemovePEMetadata(build_dir, src_dir):
   """Remove the build metadata from a PE file."""
   files = (i for i in os.listdir(build_dir) if i.endswith(('.dll', '.exe')))
 
   with open(os.path.join(BASE_DIR, 'deterministic_build_blacklist.json')) as f:
     blacklist = frozenset(json.load(f))
 
+  failed = []
   for filename in files:
     # Ignore the blacklisted files.
     if filename in blacklist:
       print 'Ignoring blacklisted file %s' % filename
       continue
     # Only run zap_timestamp on the PE files for which we have a PDB.
     if os.path.exists(os.path.join(build_dir, filename + '.pdb')):
       ret = RunZapTimestamp(src_dir, os.path.join(build_dir, filename))
       if ret != 0:
-        print "zap_timestamp.exe failed for %s." % filename
-        return ret
+        failed.append(filename)
+
+  if failed:
+    print >> sys.stderr, 'zap_timestamp.exe failed for the following files:'
+    print >> sys.stderr, '\n'.join('  ' + i for i in sorted(failed))
+    return 1
 

[M-A Ruel, 2014/10/23 02:01:21]

add a "return 0" at the end of the function

[Sébastien Marchand, 2014/10/23 02:03:53]

k, I thought it was implicit. 

 
 def main():
   parser = optparse.OptionParser(usage='%prog [options]')
   # TODO(sebmarchand): Add support for reading the list of artifact from a
   # .isolated file.
   parser.add_option('--build-dir', help='The build directory.')
   parser.add_option('--src-dir', help='The source directory.')
   options, _ = parser.parse_args()
 
   if not options.build_dir:
     parser.error('--build-dir is required')
   if not options.src_dir:
     parser.error('--src-dir is required')
 
   # There's nothing to do for the non-Windows platform yet.
   if sys.platform == 'win32':
     return RemovePEMetadata(options.build_dir, options.src_dir)
 
 
 if __name__ == '__main__':
   sys.exit(main())