| OLD | NEW |
| 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 Loading... |
| 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 '--test-host', test['app'], | 401 '--xctest', self.m.path.join( |
| 402 '--dummyproj', self.package_repo_resource( | 402 self.most_recent_app_dir, |
| 403 'scripts', 'slave', 'ios', 'TestProject', 'TestProject.xcodeproj'), | 403 '%s.app' % test['app'], |
| 404 'PlugIns', |
| 405 '%s.xctest' % test['xctest'], |
| 406 ), |
| 404 ]) | 407 ]) |
| 405 | 408 |
| 406 step_name = test['app'] | 409 step_name = test['app'] |
| 407 | 410 |
| 408 if self.platform == 'simulator': | 411 if self.platform == 'simulator': |
| 409 cmd.extend([ | 412 cmd.extend([ |
| 410 '--iossim', self.m.path['slave_build'].join(self.most_recent_iossim), | 413 '--iossim', self.m.path['slave_build'].join(self.most_recent_iossim), |
| 411 '--platform', test['device type'], | 414 '--platform', test['device type'], |
| 412 '--version', test['os'], | 415 '--version', test['os'], |
| 413 ]) | 416 ]) |
| (...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 762 self.configuration, | 765 self.configuration, |
| 763 'iossim', | 766 'iossim', |
| 764 ), | 767 ), |
| 765 'ninja': self.m.path.join( | 768 'ninja': self.m.path.join( |
| 766 'src', | 769 'src', |
| 767 build_dir, | 770 build_dir, |
| 768 '%s-%s' % (self.configuration, platform), | 771 '%s-%s' % (self.configuration, platform), |
| 769 'iossim', | 772 'iossim', |
| 770 ), | 773 ), |
| 771 }[self.compiler] | 774 }[self.compiler] |
| OLD | NEW |