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

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

Issue 2238483003: Revert "ios: fix path to the test app" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: + webrtc expectations 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
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/ios/example.expected/basic.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a50c84b502e32a2e283d92c95685c66bb85f79e8..a7a03027f2492e155bb1919fd68422b4a24276ea 100644
--- a/scripts/slave/recipe_modules/ios/api.py
+++ b/scripts/slave/recipe_modules/ios/api.py
@@ -391,7 +391,7 @@ class iOSApi(recipe_api.RecipeApi):
cmd = [
self.package_repo_resource(
'scripts', 'slave', 'ios', 'run.py'),
- '--app', self.m.path.join(
+ '--app', self.m.path['slave_build'].join(
self.most_recent_app_dir,
'%s.app' % test['app'],
),
@@ -408,7 +408,7 @@ class iOSApi(recipe_api.RecipeApi):
if self.platform == 'simulator':
cmd.extend([
- '--iossim', self.most_recent_iossim,
+ '--iossim', self.m.path['slave_build'].join(self.most_recent_iossim),
'--platform', test['device type'],
'--version', test['os'],
])
@@ -507,7 +507,7 @@ class iOSApi(recipe_api.RecipeApi):
'src/ios/build/bots/scripts/',
]
if self.platform == 'simulator':
- iossim = self.most_recent_iossim
+ iossim = self.m.path.join(self.most_recent_iossim)
cmd.extend([
'--iossim', iossim,
'--platform', '<(platform)',
@@ -725,7 +725,8 @@ class iOSApi(recipe_api.RecipeApi):
'simulator': 'iphonesimulator',
}[self.platform]
- return self.m.path['checkout'].join(
+ return self.m.path.join(
+ 'src',
build_dir,
'%s-%s' % (self.configuration, platform),
)
@@ -757,12 +758,14 @@ class iOSApi(recipe_api.RecipeApi):
}[self.platform]
return {
- 'xcodebuild': self.m.path['checkout'].join(
+ 'xcodebuild': self.m.path.join(
+ 'src',
build_dir,
self.configuration,
'iossim',
),
- 'ninja': self.m.path['checkout'].join(
+ 'ninja': self.m.path.join(
+ 'src',
build_dir,
'%s-%s' % (self.configuration, platform),
'iossim',
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/ios/example.expected/basic.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698