commit 474469dd07e368c93fc5b81802e27346d174e630
author Aviv Keshet <akeshet@chromium.org> Mon Jul 22 12:54:52 2013 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Oct 22 21:39:10 2013 +0000
tree 1046113e37915492bb18ec5f5f6048f5668e465c
parent f16b8f057e01ebcec9198b34b28353cbf8788ff0

chromite changes to reflect autotest new location usr/local/build/autotest

CQ-DEPEND=CL:I836d933e8a828177304dd10a74841138a9502aff

BUG=chromium:256906
TEST=See CQ-DEPEND'ed CL. Also, used test_that (which uses
autotest_quickmerge) to check for backwards compatibility of
autotest_quickmerge with pre-
CL:I836d933e8a828177304dd10a74841138a9502aff builds.

Change-Id: I0e76ea074c67e5fe7646a67eaf53b93fda250df9
Reviewed-on: https://chromium-review.googlesource.com/62878
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
Tested-by: Aviv Keshet <akeshet@chromium.org>
Commit-Queue: Aviv Keshet <akeshet@chromium.org>

scripts/autotest_quickmerge.py

diff --git a/scripts/autotest_quickmerge.py b/scripts/autotest_quickmerge.py
index c260f40..b6c5548 100644
--- a/scripts/autotest_quickmerge.py
+++ b/scripts/autotest_quickmerge.py
@@ -103,7 +103,7 @@
     change_list: A list of ItemizedChange objects corresponding to changed
                  or modified files.
     autotest_sysroot: Absolute path of autotest in the sysroot,
-                      e.g. '/build/lumpy/usr/local/autotest'
+                      e.g. '/build/lumpy/usr/local/build/autotest'
 
   Returns:
     A list of test package names, eg ['factory_Leds', 'login_UserPolicyKeys'].
@@ -258,7 +258,7 @@
 
   Arguments:
     autotest_sysroot: Absolute path of autotest in the sysroot,
-                      e.g. '/build/lumpy/usr/local/autotest'
+                      e.g. '/build/lumpy/usr/local/build/autotest'
   """
   osutils.RmDir(os.path.join(autotest_sysroot, 'packages'),
                              ignore_missing=True)
@@ -334,6 +334,12 @@
   parser.add_argument('--verbose', action='store_true',
                       help='Print detailed change report.')
 
+  # Used only if test_that is calling autotest_quickmerge and has detected that
+  # the sysroot autotest path is still in usr/local/autotest (ie the build
+  # pre-dates https://chromium-review.googlesource.com/#/c/62880/ )
+  parser.add_argument('--legacy_path', action='store_true',
+                      help=argparse.SUPPRESS)
+
   return parser.parse_args(argv)
 
 
@@ -362,8 +368,11 @@
 
   # TODO: Determine the following string programatically.
   sysroot_path = os.path.join('/build', args.board, '')
-  sysroot_autotest_path = os.path.join(sysroot_path, 'usr', 'local',
-                                       'autotest', '')
+  sysroot_autotest_path = os.path.join(sysroot_path,
+                                       constants.AUTOTEST_BUILD_PATH, '')
+  if args.legacy_path:
+    sysroot_autotest_path = os.path.join(sysroot_path, 'usr/local/autotest',
+                                         '')
 
   if not args.force:
     newest_dest_time = GetNewestFileTime(sysroot_autotest_path, IGNORE_SUBDIRS)