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

Unified Diff: scripts/slave/recipe_modules/ios/api.py

Issue 2223743005: ios: fix iossim path (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 4 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
Index: scripts/slave/recipe_modules/ios/api.py
diff --git a/scripts/slave/recipe_modules/ios/api.py b/scripts/slave/recipe_modules/ios/api.py
index 09f0615bd6d33ef4dd2805d0f7a18c7fc38c1919..0c43801cbfcd6b81340fbe9b85da91774d3f0917 100644
--- a/scripts/slave/recipe_modules/ios/api.py
+++ b/scripts/slave/recipe_modules/ios/api.py
@@ -407,7 +407,7 @@ class iOSApi(recipe_api.RecipeApi):
if self.platform == 'simulator':
cmd.extend([
- '--iossim', self.m.path['slave_build'].join(self.most_recent_iossim),
+ '--iossim', self.most_recent_iossim,
'--platform', test['device type'],
'--version', test['os'],
])
@@ -506,7 +506,7 @@ class iOSApi(recipe_api.RecipeApi):
'src/ios/build/bots/scripts/',
]
if self.platform == 'simulator':
- iossim = self.m.path.join(self.most_recent_iossim)
+ iossim = self.most_recent_iossim
cmd.extend([
'--iossim', iossim,
'--platform', '<(platform)',
@@ -756,14 +756,12 @@ class iOSApi(recipe_api.RecipeApi):
}[self.platform]
return {
- 'xcodebuild': self.m.path.join(
- 'src',
+ 'xcodebuild': self.m.path['checkout'].join(
build_dir,
self.configuration,
'iossim',
),
- 'ninja': self.m.path.join(
- 'src',
+ 'ninja': self.m.path['checkout'].join(
build_dir,
'%s-%s' % (self.configuration, platform),
'iossim',

Powered by Google App Engine
This is Rietveld 408576698