Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(773)

Unified Diff: scripts/slave/ios/find_xcode.py

Issue 950973002: Temporarily make find_xcode.py prefix match on the tryserver (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/ios/find_xcode.py
diff --git a/scripts/slave/ios/find_xcode.py b/scripts/slave/ios/find_xcode.py
index 1a58191887776e10c7578c7d5b845097e2b794f6..026364fbbdbab360d66540b9a2335be933f7b7bb 100755
--- a/scripts/slave/ios/find_xcode.py
+++ b/scripts/slave/ios/find_xcode.py
@@ -139,11 +139,20 @@ def find_xcode(target_version):
build_version,
)
- if version == target_version:
- xcode_info['matches'][installation_path] = "%s (%s)" % (
- version,
- build_version,
- )
+ # TODO(smut): Remove prefix matching hack when http://crbug.com/461005
+ # is fixed.
+ if os.environ.get('BUILDBOT_MASTERNAME') == 'tryserver.chromium.mac':
+ if version.startswith(target_version):
+ xcode_info['matches'][installation_path] = "%s (%s)" % (
+ version,
+ build_version,
+ )
+ else:
+ if version == target_version:
+ xcode_info['matches'][installation_path] = "%s (%s)" % (
+ version,
+ build_version,
+ )
# If this is the first match, switch to it.
if not xcode_info['found']:
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698