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

scripts/slave/chromium/archive_layout_test_results.py

Index: scripts/slave/chromium/archive_layout_test_results.py
diff --git a/scripts/slave/chromium/archive_layout_test_results.py b/scripts/slave/chromium/archive_layout_test_results.py
index 339231eb009698c77354b4e9fed388fb49d45157..a95ba002a2cf7249988c9f555a2041771b749046 100755
--- a/scripts/slave/chromium/archive_layout_test_results.py
+++ b/scripts/slave/chromium/archive_layout_test_results.py
@@ -31,7 +31,6 @@ 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
@@ -160,10 +159,10 @@ def _MaybeMakeDirectoryOnArchiveHost(dest_dir):
 
 
 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)
@@ -261,7 +260,8 @@ def archive_layout(options):
 
 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')
@@ -286,7 +286,6 @@ def _ParseOptions():
                                 'slave\'s build directory.')
   chromium_utils.AddPropertiesOptions(option_parser)
   options, _ = option_parser.parse_args()
-  options.build_dir = build_directory.GetBuildOutputDirectory()
   return options