Chromium Code Reviews| Index: scripts/slave/ios/test_runner.py |
| diff --git a/scripts/slave/ios/test_runner.py b/scripts/slave/ios/test_runner.py |
| index 8952d2daaca2237e44f22104a5edeedb8fcad557..a5a76452adfd8beee27fe3b1ef35eb9f5465ea4f 100755 |
| --- a/scripts/slave/ios/test_runner.py |
| +++ b/scripts/slave/ios/test_runner.py |
| @@ -1275,13 +1275,28 @@ class SimulatorXCTestRunner(XCTestRunner): |
| xctests_fullname = self.test_target_name + '.xctest' |
| xctest_path = os.path.join(app_path, 'PlugIns', xctests_fullname) |
| - cmd = [ |
| - os.path.join(built_dir, 'iossim'), |
| - '-d', self.platform, |
| - '-s', self.version, |
| - app_path, |
| - xctest_path |
| - ] |
| + if self.xcode_version == '8.0': |
|
baxley
2016/08/15 18:17:34
How long do we expect this to be in place?
If the
smut
2016/08/15 18:57:52
Ideally we should remove it when Xcode 8 is used b
|
| + cmd = [ |
| + os.path.join(built_dir, 'iossim'), |
| + '-d', self.platform, |
| + '-s', self.version, |
| + app_path, |
| + xctest_path |
| + ] |
| + else: |
| + cmd = [ |
| + 'xcodebuild', 'test-without-building', |
| + 'BUILT_PRODUCTS_DIR=%s' % built_dir, |
| + '-project', self.test_project_dir, |
| + '-scheme','TestProject', |
| + '-destination','platform=iOS Simulator,name=%s,OS=%s' |
| + % (self.platform, self.version), |
| + '-archivePath', self.homedir, |
| + 'APP_TARGET_NAME=%s' % self.test_host_name, |
| + 'TEST_TARGET_NAME=%s' % self.test_target_name, |
| + 'NSUnbufferedIO=YES' |
| + ] |
| + |
| return cmd |
| @TestRunner.RequireTearDown |