Add support for new iossim in Xcode 8.

scripts/slave/ios/test_runner.py

Index: scripts/slave/ios/test_runner.py
diff --git a/scripts/slave/ios/test_runner.py b/scripts/slave/ios/test_runner.py
index c4aef8e7773b2b9fed561e880efa88df5f9303f2..b1603b00e012d3129681b4090374212a7abab6df 100755
--- a/scripts/slave/ios/test_runner.py
+++ b/scripts/slave/ios/test_runner.py
@@ -487,6 +487,7 @@ class SimulatorTestRunner(TestRunner):
     self.timeout = '120'
     self.homedir = ''
     self.start_time = None
+    self.xcode_version = xcode_version

[smut, 2016/07/12 23:58:59]

Can probably set this in the base class.

[justincohen, 2016/07/14 19:59:50]

Done.

 
   def SetStartTime(self):
     """Sets the start time, for finding crash reports during this run."""
@@ -496,13 +497,26 @@ class SimulatorTestRunner(TestRunner):
 
   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,
+        '-p'
+      ]

[smut, 2016/07/12 23:58:59]

Can we use -w to wipe the simulator here, so that every time
CreateNewHomeDirectory is called we are getting a fresh simulator with a
different homedir?

[justincohen, 2016/07/14 19:59:50]

See below.

[smut, 2016/07/14 21:25:54]

I think it should wipe here as well. This call that needs to ensure we get a new
home directory. e.g. if CreateNewHomeDirectory is called twice in a row for
Xcode 7 it will actually get a new home dir the second time, but for Xcode 8 it
seems like it would just print the same thing out unless it was explicitly
wiped. Am I wrong about that?

[justincohen, 2016/07/14 22:24:32]

Wipe is very fast, this SGTM, done.

+      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':
       self.homedir = ''

[smut, 2016/07/12 23:58:59]

I think it should shutil.rmtree even on Xcode 8 so we do the post-test cleanup
and free up the disk space used to install and run the test.

[justincohen, 2016/07/14 19:59:50]

Xcode seems to freak out.  How about we just call -w here instead?

[smut, 2016/07/14 21:25:54]

Ok seems fine. -w should wipe the installed app and any data it wrote to the
simulator and free up the disk space anyways, right?

[justincohen, 2016/07/14 22:24:32]

yes/

+    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."""
@@ -682,11 +696,18 @@ class SimulatorTestRunner(TestRunner):
       self.iossim_path,
       '-d', self.platform,
       '-s', self.version,
-      '-t', self.timeout,
-      '-u', self.homedir,
     ]
+
     args = []
 
+    if self.xcode_version == '8.0':
+      cmd.extend(['-w'])

[smut, 2016/07/12 23:58:59]

I don't think it should include -w here. GetLaunchCommand may be called multiple
times to ensure all the test cases run even if one crashes and these should all
be in the same simulator so we can get all the test data at the end. Won't -w
erase the test data in the test's Documents directory when it wipes the
simulator?

[justincohen, 2016/07/14 19:59:50]

Removed.

+    else:
+      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)
@@ -694,7 +715,13 @@ class SimulatorTestRunner(TestRunner):
       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)