Allow a single project to map to multiple paths.
Right now, cbuildbot assumes that each project maps to a single path.
To fix this, I've updated all remaining callers to use new APIs that
allow for each project to map to multiple checkouts.
BUG=chromium:314917
TEST=unit tests
TEST=paladin, canary, chromiumos-sdk trybots
TEST=create branch using branchutil
TEST=merge change with cros_merge_to_branch
TEST=Run cros_list_modified_packages
TEST=Merge a change using autotest_quickmerge
Change-Id: I1cb99705e8af99b97e048a8604014b0a0d046b6a
Reviewed-on: https://chromium-review.googlesource.com/176363
Reviewed-by: Matt Tennant <mtennant@chromium.org>
Tested-by: David James <davidjames@chromium.org>
Commit-Queue: David James <davidjames@chromium.org>
diff --git a/scripts/autotest_quickmerge.py b/scripts/autotest_quickmerge.py
index 33b3d4d..97b525f 100644
--- a/scripts/autotest_quickmerge.py
+++ b/scripts/autotest_quickmerge.py
@@ -361,8 +361,8 @@
return 1
manifest = git.ManifestCheckout.Cached(constants.SOURCE_ROOT)
- source_path = manifest.GetProjectPath(AUTOTEST_PROJECT_NAME, absolute=True)
- source_path = os.path.join(source_path, '')
+ checkout = manifest.FindCheckout(AUTOTEST_PROJECT_NAME)
+ source_path = os.path.join(checkout.GetPath(absolute=True), '')
script_path = os.path.dirname(__file__)
include_pattern_file = os.path.join(script_path, INCLUDE_PATTERNS_FILENAME)