diff options
| author | Caroline Tice <cmtice@google.com> | 2016-10-05 16:50:07 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-10-05 18:18:14 -0700 |
| commit | 59b328726cdf961f8c839fed049f6df31d614d0b (patch) | |
| tree | f347c3bc5581225649cdc82734312175f93e91c5 | |
| parent | 33da0c4d4b1186d1795dabb037de2e721b95a816 (diff) | |
| download | toolchain-utils-59b328726cdf961f8c839fed049f6df31d614d0b.tar.gz | |
[crosperf] Fix xbuddy to work with new -toolchain builders.
The xbuddy translating code was improperly prepending to board
name to the waterfall builder trybot images (the ones with the
generic architecture names). This CL fixes that.
BUG=chromium:653210
TEST=Tested crosperf with 'build: x86-llvm-toolchain/R55-8865.0.0-rc1';
failed without this CL, worked with it.
Change-Id: I706c9d882f9c99f8af11eb1782ea6edd1eedbfe5
Reviewed-on: https://chrome-internal-review.googlesource.com/293815
Commit-Ready: Caroline Tice <cmtice@google.com>
Tested-by: Caroline Tice <cmtice@google.com>
Reviewed-by: Yunlian Jiang <yunlian@google.com>
| -rw-r--r-- | crosperf/settings.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crosperf/settings.py b/crosperf/settings.py index ad5ed622..3182bf6c 100644 --- a/crosperf/settings.py +++ b/crosperf/settings.py @@ -69,7 +69,8 @@ class Settings(object): def GetXbuddyPath(self, path_str, board, chromeos_root, log_level): prefix = 'remote' l = logger.GetLogger() - if path_str.find('trybot') < 0 and path_str.find(board) < 0: + if (path_str.find('trybot') < 0 and path_str.find('toolchain') < 0 and + path_str.find(board) < 0): xbuddy_path = '%s/%s/%s' % (prefix, board, path_str) else: xbuddy_path = '%s/%s' % (prefix, path_str) |