Add support for new iossim in Xcode 8.

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 137 matching lines @@
         raise XcodeVersionNotFoundError(xcode_version)
 
     self.gs_bucket = gs_bucket
     self.perf_bot_name = perf_bot_name
     self.perf_master_name = perf_master_name
     self.perf_revision = perf_revision
     self.perf_build_number = perf_build_number
     self.perf_builder_name = perf_builder_name
     self.perf_x_value = perf_x_value
     self.test_args = test_args or []
+    self.xcode_version = xcode_version
 
     self.summary = {
       'links': collections.OrderedDict(),
       'logs': collections.OrderedDict(),
     }
 
   @staticmethod
   def Print(message, blank_lines=0, time_to_sleep=0):
     """Prints a message.
 
@@ skipping 312 matching lines @@
       '-c', 'Print:CFBundleIdentifier',
       os.path.join(self.app_path, 'Info.plist'),
     ).stdout[0]
 
     self.iossim_path = iossim_path
     self.platform = platform
     self.version = version
     self.timeout = '120'
     self.homedir = ''
     self.start_time = None
+    self.xcode_version = xcode_version
 
   def SetStartTime(self):
     """Sets the start time, for finding crash reports during this run."""
     # Crash reports have a timestamp in their filename, formatted as
     # YYYY-MM-DD-HHMMSS.
     self.start_time = time.strftime('%Y-%m-%d-%H%M%S', time.localtime())
 
   def CreateNewHomeDirectory(self):
     """Creates a new home directory for the simulator."""
-    self.homedir = tempfile.mkdtemp()
+    if self.xcode_version == '8.0':
+      cmd = [
+        self.iossim_path,
+        '-d', self.platform,
+        '-s', self.version,
+        '-w'
+      ]
+      subprocess.check_output(cmd)
+      cmd = [
+        self.iossim_path,
+        '-d', self.platform,
+        '-s', self.version,
+        '-p'
+      ]
+      self.homedir = subprocess.check_output(cmd)
+    else:
+      self.homedir = tempfile.mkdtemp()
+
 
   def RemoveHomeDirectory(self):
     """Recursively removes the home directory being used by the simulator."""
-    if os.path.exists(self.homedir):
-      shutil.rmtree(self.homedir, ignore_errors=True)
+    if self.xcode_version == '8.0':
+      cmd = [
+        self.iossim_path,
+        '-d', self.platform,
+        '-s', self.version,
+        '-w'
+      ]
+      subprocess.check_output(cmd)
       self.homedir = ''
+    else:
+      if os.path.exists(self.homedir):
+        shutil.rmtree(self.homedir, ignore_errors=True)
+        self.homedir = ''
 
   def KillSimulators(self):
     """Forcibly kills any running iOS simulator instances."""
     kill_cmd = [
       'pkill',
       '-9',
       '-x',
       # The iOS simulator has a different name depending on the Xcode version.
       'iPhone Simulator',  # Xcode 5
       'iOS Simulator',  # Xcode 6
@@ skipping 159 matching lines @@
       blacklist: Whether to blacklist the elements of test_filter or not. Only
         works when test_filter is not None.
 
     Returns:
       A list whose elements are the args representing the command.
     """
     cmd = [
       self.iossim_path,
       '-d', self.platform,
       '-s', self.version,
-      '-t', self.timeout,
-      '-u', self.homedir,
     ]
     args = []
 
+    if self.xcode_version != '8.0':
+      cmd.extend([
+        '-t', self.timeout,
+        '-u', self.homedir
+      ])
+
     if test_filter is not None:
       kif_filter = self.GetKIFTestFilter(test_filter, blacklist)
       gtest_filter = self.GetGTestFilter(test_filter, blacklist)
 
       cmd.extend([
        '-e', 'GKIF_SCENARIO_FILTER=%s' % kif_filter,
       ])
-      args.append('--gtest_filter=%s' % gtest_filter)
+
+      if self.xcode_version == '8.0':
+        cmd.extend([
+         '-c', '--gtest_filter=%s' % gtest_filter,
+        ])
+      else:
+        args.append('--gtest_filter=%s' % gtest_filter)
 
     cmd.append(self.app_path)
     cmd.extend(self.test_args)
     cmd.extend(args)
     return cmd
 
   @TestRunner.RequireTearDown
   def Launch(self, *args, **kwargs):
     """Launches the test."""
     self.SetUp()
@@ skipping 681 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)