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

Side by Side Diff: scripts/slave/recipe_modules/ios/api.py

Issue 2232723004: Revert of Use iossim/test-without-building for Earlgrey tests. (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 unified diff | Download patch
« no previous file with comments | « scripts/slave/ios/test_runner.py ('k') | scripts/slave/recipes/ios/unified_builder_tester.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import copy 5 import copy
6 6
7 from recipe_engine import recipe_api 7 from recipe_engine import recipe_api
8 8
9 9
10 class iOSApi(recipe_api.RecipeApi): 10 class iOSApi(recipe_api.RecipeApi):
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 self.package_repo_resource( 391 self.package_repo_resource(
392 'scripts', 'slave', 'ios', 'run.py'), 392 'scripts', 'slave', 'ios', 'run.py'),
393 '--app', self.m.path.join( 393 '--app', self.m.path.join(
394 self.most_recent_app_dir, 394 self.most_recent_app_dir,
395 '%s.app' % test['app'], 395 '%s.app' % test['app'],
396 ), 396 ),
397 '--json_file', self.m.json.output(), 397 '--json_file', self.m.json.output(),
398 ] 398 ]
399 if test.get('xctest'): 399 if test.get('xctest'):
400 cmd.extend([ 400 cmd.extend([
401 '--xctest', self.m.path.join( 401 '--test-host', test['app'],
402 self.most_recent_app_dir, 402 '--dummyproj', self.package_repo_resource(
403 '%s.app' % test['app'], 403 'scripts', 'slave', 'ios', 'TestProject', 'TestProject.xcodeproj'),
404 'PlugIns',
405 '%s.xctest' % test['xctest'],
406 ),
407 ]) 404 ])
408 405
409 step_name = test['app'] 406 step_name = test['app']
410 407
411 if self.platform == 'simulator': 408 if self.platform == 'simulator':
412 cmd.extend([ 409 cmd.extend([
413 '--iossim', self.m.path['slave_build'].join(self.most_recent_iossim), 410 '--iossim', self.m.path['slave_build'].join(self.most_recent_iossim),
414 '--platform', test['device type'], 411 '--platform', test['device type'],
415 '--version', test['os'], 412 '--version', test['os'],
416 ]) 413 ])
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
765 self.configuration, 762 self.configuration,
766 'iossim', 763 'iossim',
767 ), 764 ),
768 'ninja': self.m.path.join( 765 'ninja': self.m.path.join(
769 'src', 766 'src',
770 build_dir, 767 build_dir,
771 '%s-%s' % (self.configuration, platform), 768 '%s-%s' % (self.configuration, platform),
772 'iossim', 769 'iossim',
773 ), 770 ),
774 }[self.compiler] 771 }[self.compiler]
OLDNEW
« no previous file with comments | « scripts/slave/ios/test_runner.py ('k') | scripts/slave/recipes/ios/unified_builder_tester.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698