Also archive diff files in layout-test-results.zip.

scripts/slave/chromium/archive_layout_test_results.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.
 
 """A tool to archive layout test results.
 
 To archive files on Google Storage, pass a GS bucket name via --gs-bucket.
 To control access to archives, pass a value for --gs-acl (e.g. 'public-read',
 see https://developers.google.com/storage/docs/accesscontrol#extension
@@ skipping 17 matching lines @@
 from common import archive_utils
 from common import chromium_utils
 from slave import build_directory
 from slave import slave_utils
 
 # Directory name, above the build directory, in which test results can be
 # found if no --results-dir option is given.
 RESULT_DIR = 'layout-test-results'
 
 
-def _CollectArchiveFiles(output_dir):
-  """Returns a list of actual layout test result files to archive."""
-  actual_file_list = []
+def _CollectZipArchiveFiles(output_dir):
+  """Returns a list of layout test result files to archive in a zip file."""
+  file_list = []
 
   for path, _, files in os.walk(output_dir):
     rel_path = path[len(output_dir + '\\'):]
     for name in files:
       if _IsActualResultFile(name):
-        actual_file_list.append(os.path.join(rel_path, name))
+        file_list.append(os.path.join(rel_path, name))
+      if _IsDiffFile(name):
+        diff_file_list.append(os.path.join(rel_path, name))

[Dirk Pranke, 2016/10/18 20:00:51]

diff_file_list isn't declared or returned? Did you mean to append this to
file_list? If so, maybe just combine _IsActualResultFile() and _IsDiffFile()?

[qyearsley, 2016/10/18 20:50:33]

Right, that's what I meant -- now merged them and updated this in the latest
patchset.

       elif name.endswith('.json'):
-        actual_file_list.append(os.path.join(rel_path, name))
+        file_list.append(os.path.join(rel_path, name))
 
   if os.path.exists(os.path.join(output_dir, 'results.html')):
-    actual_file_list.append('results.html')
+    file_list.append('results.html')
 
   if sys.platform == 'win32':
     if os.path.exists(os.path.join(output_dir, 'access_log.txt')):
-      actual_file_list.append('access_log.txt')
+      file_list.append('access_log.txt')
     if os.path.exists(os.path.join(output_dir, 'error_log.txt')):
-      actual_file_list.append('error_log.txt')
+      file_list.append('error_log.txt')
 
-  return actual_file_list
+  return file_list
 
 
 def _IsActualResultFile(name):
   if '-stack.' in name or '-crash-log.' in name:
     return True
   extension = os.path.splitext(name)[1]
   return ('-actual.' in name and extension in
           ('.txt', '.png', '.checksum', '.wav'))
 
 
+def _IsDiffFile(name):
+  return ('-wdiff.' in name or
+          '-expected.' in name or
+          name.endswith('-diff.txt') or
+          name.endswith('-diff.png'))
+
+
 def archive_layout(options):
   chrome_dir = os.path.abspath(options.build_dir)
   results_dir_basename = os.path.basename(options.results_dir)
   if options.results_dir is not None:
     options.results_dir = os.path.abspath(os.path.join(options.build_dir,
                                                        options.results_dir))
   else:
     options.results_dir = chromium_utils.FindUpward(chrome_dir, RESULT_DIR)
   print 'Archiving results from %s' % options.results_dir
   staging_dir = options.staging_dir or slave_utils.GetStagingDir(chrome_dir)
   print 'Staging in %s' % staging_dir
   if not os.path.exists(staging_dir):
     os.makedirs(staging_dir)
 
-  actual_file_list = _CollectArchiveFiles(options.results_dir)
+  file_list = _CollectZipArchiveFiles(options.results_dir)
   zip_file = chromium_utils.MakeZip(staging_dir,
                                     results_dir_basename,
-                                    actual_file_list,
+                                    file_list,
                                     options.results_dir)[1]
 
   # Extract the build name of this slave (e.g., 'chrome-release') from its
   # configuration file if not provided as a param.
   build_name = options.builder_name or slave_utils.SlaveBuildName(chrome_dir)
   build_name = re.sub('[ .()]', '_', build_name)
 
   wc_dir = os.path.dirname(chrome_dir)
   last_change = slave_utils.GetHashOrRevision(wc_dir)
 
@@ skipping 80 matching lines @@
   options = _ParseOptions()
   logging.basicConfig(level=logging.INFO,
                       format='%(asctime)s %(filename)s:%(lineno)-3d'
                              ' %(levelname)s %(message)s',
                       datefmt='%y%m%d %H:%M:%S')
   return archive_layout(options)
 
 
 if '__main__' == __name__:
   sys.exit(main())