Add command to run earlgrey tests upstream.

scripts/slave/ios/test_runner.py

 #!/usr/bin/python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Contains test runners for launching tests on simulators and devices."""
 
 # pylint: disable=relative-import
 import environment_setup
 
@@ skipping 1257 matching lines @@
 
     Returns:
       A list whose elements are the args representing the command.
     """
     built_dir = os.path.split(self.app_path)[0]
 
     app_path = os.path.join(built_dir, self.test_host_name + '.app/')
     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
-    ]
+    cmd=''

[smut, 2016/08/12 23:45:35]

You don't need this initialization since you define cmd in both the if and else
code paths. Also this is the wrong initialization anyways since cmd is expected
to be a list.

+    if self.xcode_version == '8.0':
+      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
   def Launch(self, *args, **kwargs):
     """Launches the test."""
     self.SetUp()
 
     result = self._Run(
       self.GetLaunchCommand(), self.GetLaunchEnvironment(), *args, **kwargs)
 
@@ skipping 169 matching lines @@
       )
 
       # Uninstall and re-install the app.
       self.UninstallApp()
       self.InstallApp()
 
       result = self._Run(
         self.GetLaunchCommand(), self.GetLaunchEnvironment(), *args, **kwargs)
 
     return self.RunAllTests(result, *args, **kwargs)