WebRTC: Add iOS bots running tests with the simulator

scripts/slave/recipes/webrtc/ios.py

Index: scripts/slave/recipes/webrtc/ios.py
diff --git a/scripts/slave/recipes/ios/unified_builder_tester.py b/scripts/slave/recipes/webrtc/ios.py
similarity index 68%
copy from scripts/slave/recipes/ios/unified_builder_tester.py
copy to scripts/slave/recipes/webrtc/ios.py
index 5a36b9736e4684bcc83b50756a8a0f418842ff21..46b3abc6f1a047dbcde5f29e4b2fbf20a265e1f2 100644
--- a/scripts/slave/recipes/ios/unified_builder_tester.py
+++ b/scripts/slave/recipes/webrtc/ios.py
@@ -1,20 +1,42 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
+# Copyright 2016 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.
 
 DEPS = [
+  'depot_tools/bot_update',
+  'depot_tools/gclient',
   'ios',
+  'recipe_engine/path',
   'recipe_engine/platform',
   'recipe_engine/properties',
+  'webrtc'
 ]
 
 def RunSteps(api):
+  api.gclient.set_config('webrtc_ios')
+
   api.ios.host_info()
-  api.ios.checkout()
-  api.ios.read_build_config()
+  api.bot_update.ensure_checkout()
+  api.path['checkout'] = api.path['slave_build'].join('src')
+
+  build_config_dir = api.path['checkout'].join(
+      'webrtc',
+      'build',
+      'ios',
+      api.properties['mastername'],
+  )
+  include_dir = api.path['checkout'].join(
+      'webrtc',
+      'build',
+      'ios',
+      'tests',
+  )
+  api.ios.read_build_config(build_config_dir=build_config_dir,
+                            include_dir=include_dir)
   api.ios.build()
   api.ios.test()
 
+
 def GenTests(api):
   yield (
     api.test('basic')
@@ -30,12 +52,9 @@ def GenTests(api):
       'GYP_DEFINES': {
         'fake gyp define 1': 'fake value 1',
         'fake gyp define 2': 'fake value 2',
+        'use_goma': '1',
       },
-      'env': {
-        'fake env var 1': 'fake env value 1',
-        'fake env var 2': 'fake env value 2',
-      },
-      'compiler': 'xcodebuild',
+      'compiler': 'ninja',
       'configuration': 'Debug',
       'sdk': 'iphonesimulator8.0',
       'tests': [
@@ -67,6 +86,7 @@ def GenTests(api):
       'GYP_DEFINES': {
         'fake gyp define 1': 'fake value 1',
         'fake gyp define 2': 'fake value 2',
+        'use_goma': '1',
       },
       'compiler': 'ninja',
       'configuration': 'Release',
@@ -77,7 +97,7 @@ def GenTests(api):
   )
 
   yield (
-    api.test('goma')
+    api.test('trybot')
     + api.platform('mac', 64)
     + api.properties(
       buildername='ios',
@@ -92,6 +112,7 @@ def GenTests(api):
         'fake gyp define 2': 'fake value 2',
         'use_goma': '1',
       },
+      'use_analyze': 'false',
       'compiler': 'ninja',
       'configuration': 'Release',
       'sdk': 'iphoneos8.0',
@@ -175,67 +196,3 @@ def GenTests(api):
     )
   )
 
-  yield (
-    api.test('multiple_failures')
-    + api.platform('mac', 64)
-    + api.properties(
-      buildername='ios',
-      buildnumber='0',
-      mastername='chromium.fake',
-      slavename='fake-vm',
-    )
-    + api.ios.make_test_build_config({
-      'xcode version': 'fake xcode version',
-      'GYP_DEFINES': {
-        'fake gyp define 1': 'fake value 1',
-        'fake gyp define 2': 'fake value 2',
-      },
-      'compiler': 'xcodebuild',
-      'configuration': 'Debug',
-      'sdk': 'iphonesimulator7.1',
-      'tests': [
-        {
-          'app': 'fake tests 1',
-          'device type': 'fake device',
-          'os': '8.1',
-        },
-        {
-          'app': 'fake tests 2',
-          'device type': 'fake device',
-          'os': '8.1',
-        },
-        {
-          'app': 'fake tests 3',
-          'device type': 'fake device',
-          'os': '8.1',
-        },
-        {
-          'app': 'fake tests 4',
-          'device type': 'fake device',
-          'os': '8.1',
-        },
-        {
-          'app': 'fake tests 5',
-          'device type': 'fake device',
-          'os': '8.1',
-        },
-        {
-          'app': 'fake tests 6',
-          'device type': 'fake device',
-          'os': '8.1',
-        },
-      ],
-    })
-    + api.step_data(
-      'fake tests 2 (fake device iOS 8.1)',
-      retcode=1
-    )
-    + api.step_data(
-      'fake tests 3 (fake device iOS 8.1)',
-      retcode=1
-    )
-    + api.step_data(
-      'fake tests 5 (fake device iOS 8.1)',
-      retcode=2
-    )
-  )