Use passed-in --build-dir instead of GetBuildOutputDirectory in archive_layout_test_results.py.

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 generated by buildbots.
 
 Actual result files (*-actual.txt), but not results from simplified diff
 tests (*-simp-actual.txt) or JS-filtered diff tests (*-jsfilt.txt), will
 be included in the archive.
@@ skipping 13 matching lines @@
 
 import logging
 import optparse
 import os
 import re
 import socket
 import sys
 
 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 pair of lists of file paths to archive.
 
@@ skipping 108 matching lines @@
     print 'saving results to %s' % dest_dir
   elif chromium_utils.IsLinux() or chromium_utils.IsMac():
     chromium_utils.SshMakeDirectory(host, dest_dir)
     print 'saving results to "%s" on "%s"' % (dest_dir, host)
   else:
     raise NotImplementedError(
         'Platform "%s" is not currently supported.' % sys.platform)
 
 
 def archive_layout(options):
-  chrome_dir = os.path.abspath(options.build_dir)
+  chrome_dir = os.path.abspath(build_dir)

[Dirk Pranke, 2016/10/13 23:34:43]

Doesn't this still need to be options.build_dir?

[qyearsley, 2016/10/13 23:48:05]

Yep! Now fixed.

   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 = os.path.abspath(os.path.join(build_dir,

[Dirk Pranke, 2016/10/13 23:34:43]

Same.

                                                        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, diff_file_list) = _CollectArchiveFiles(options.results_dir)
@@ skipping 77 matching lines @@
     _CopyFileToArchiveHost(full_results_json, dest_dir)
     _CopyFileToArchiveHost(failing_results_json, dest_dir)
     # Not supported on Google Storage yet.
     _ArchiveFullLayoutTestResults(staging_dir, dest_parent_dir, diff_file_list,
                                   options)
   return 0
 
 
 def _ParseOptions():
   option_parser = optparse.OptionParser()
-  option_parser.add_option('', '--build-dir', help='ignored')
+  option_parser.add_option('', '--build-dir',
+                           help='Build dir path, relative to checkout root.')
   option_parser.add_option('', '--results-dir',
                            help='path to layout test results, relative to '
                                 'the build_dir')
   option_parser.add_option('', '--builder-name',
                            default=None,
                            help='The name of the builder running this script.')
   option_parser.add_option('', '--build-number',
                            default=None,
                            help=('The build number of the builder running'
                                  'this script.'))
   option_parser.add_option('', '--gs-bucket',
                            default=None,
                            help=('The google storage bucket to upload to. '
                                  'If provided, this script will upload to gs '
                                  'instead of the master.'))
   option_parser.add_option('', '--gs-acl',
                            default=None,
                            help=('The ACL of the google storage files.'))
   option_parser.add_option('--staging-dir',
                            help='Directory to use for staging the archives. '
                                 'Default behavior is to automatically detect '
                                 'slave\'s build directory.')
   chromium_utils.AddPropertiesOptions(option_parser)
   options, _ = option_parser.parse_args()
-  options.build_dir = build_directory.GetBuildOutputDirectory()
   return options
 
 
 def main():
   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())