Revert of Use iossim/test-without-building for Earlgrey tests.

scripts/slave/ios/run.py

Index: scripts/slave/ios/run.py
diff --git a/scripts/slave/ios/run.py b/scripts/slave/ios/run.py
index f917664da0df6b8da6b2fb634484389d93c13947..0d4f55534cfa8cd83565a0b9fcadc1cd735f9117 100755
--- a/scripts/slave/ios/run.py
+++ b/scripts/slave/ios/run.py
@@ -32,11 +32,11 @@
   test_runner = None
 
   try:
-    if args.xctest:
+    if args.test_host:
       test_runner = SimulatorXCTestRunner(
         args.app,
-        args.xctest,
-        args.iossim,
+        args.test_host,
+        args.dummyproj,
         args.platform,
         args.version,
         env_vars=args.env_var,
@@ -93,6 +93,13 @@
     type=str,
   )
   parser.add_argument(
+    '-d',
+    '--dummyproj',
+    help='Dummy test project path.',
+    metavar='.xcodeproj',
+    type=str,
+  )
+  parser.add_argument(
     '-e',
     '--env-var',
     action='append',
@@ -123,6 +130,13 @@
     type=str,
   )
   parser.add_argument(
+    '-t',
+    '--test-host',
+    help='Compiled test host to run tests.',
+    metavar='host',
+    type=str,
+  )
+  parser.add_argument(
     '-v',
     '--version',
     help='Version of iOS the simulator should run.',
@@ -137,11 +151,4 @@
     metavar='ver',
     type=str,
   )
-  parser.add_argument(
-    '--xctest',
-    help='Compiled xctest to run.',
-    metavar='xctest',
-    type=str,
-  )
-
   sys.exit(main(*parser.parse_known_args()))