| OLD | NEW |
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 DEPS = [ | 5 DEPS = [ |
| 6 'chromium_tests', | 6 'chromium_tests', |
| 7 'depot_tools/bot_update', | 7 'depot_tools/bot_update', |
| 8 'depot_tools/gclient', | 8 'depot_tools/gclient', |
| 9 'ios', | 9 'ios', |
| 10 'recipe_engine/path', | 10 'recipe_engine/path', |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 'ios', | 31 'ios', |
| 32 ) | 32 ) |
| 33 buildername = api.properties['buildername'].replace(' ', '_') | 33 buildername = api.properties['buildername'].replace(' ', '_') |
| 34 api.ios.read_build_config(build_config_base_dir=build_config_base_dir, | 34 api.ios.read_build_config(build_config_base_dir=build_config_base_dir, |
| 35 buildername=buildername) | 35 buildername=buildername) |
| 36 mb_config_path = api.path['checkout'].join( | 36 mb_config_path = api.path['checkout'].join( |
| 37 'webrtc', | 37 'webrtc', |
| 38 'build', | 38 'build', |
| 39 'mb_config.pyl', | 39 'mb_config.pyl', |
| 40 ) | 40 ) |
| 41 api.ios.build(mb_config_path=mb_config_path) | 41 gyp_script = api.path['checkout'].join( |
| 42 'webrtc', |
| 43 'build', |
| 44 'gyp_webrtc.py', |
| 45 ) |
| 46 api.ios.build(mb_config_path=mb_config_path, gyp_script=gyp_script) |
| 42 api.ios.test() | 47 api.ios.test() |
| 43 | 48 |
| 44 | 49 |
| 45 def GenTests(api): | 50 def GenTests(api): |
| 46 yield ( | 51 yield ( |
| 47 api.test('basic') | 52 api.test('basic') |
| 48 + api.platform('mac', 64) | 53 + api.platform('mac', 64) |
| 49 + api.properties( | 54 + api.properties( |
| 50 buildername='ios debug', | 55 buildername='ios debug', |
| 51 buildnumber='0', | 56 buildnumber='0', |
| 52 mastername='chromium.fake', | 57 mastername='chromium.fake', |
| 53 slavename='fake-vm', | 58 slavename='fake-vm', |
| 54 path_config='kitchen', | 59 path_config='kitchen', |
| 55 ) | 60 ) |
| 56 + api.ios.make_test_build_config({ | 61 + api.ios.make_test_build_config({ |
| 57 'xcode version': 'fake xcode version', | 62 'xcode version': 'fake xcode version', |
| 58 'GYP_DEFINES': { | 63 'GYP_DEFINES': { |
| 59 'fake gyp define 1': 'fake value 1', | 64 'fake gyp define 1': 'fake value 1', |
| 60 'fake gyp define 2': 'fake value 2', | 65 'fake gyp define 2': 'fake value 2', |
| 61 'use_goma': '1', | 66 'use_goma': '1', |
| 62 }, | 67 }, |
| 68 'mb_type': 'gyp', |
| 63 'compiler': 'ninja', | 69 'compiler': 'ninja', |
| 64 'configuration': 'Debug', | 70 'configuration': 'Debug', |
| 65 'sdk': 'iphonesimulator8.0', | 71 'sdk': 'iphonesimulator8.0', |
| 66 'tests': [ | 72 'tests': [ |
| 67 { | 73 { |
| 68 'app': 'fake tests 1', | 74 'app': 'fake tests 1', |
| 69 'device type': 'fake device', | 75 'device type': 'fake device', |
| 70 'os': '8.0', | 76 'os': '8.0', |
| 71 }, | 77 }, |
| 72 { | 78 { |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 slavename='fake-vm', | 120 slavename='fake-vm', |
| 115 path_config='kitchen', | 121 path_config='kitchen', |
| 116 ) | 122 ) |
| 117 + api.ios.make_test_build_config({ | 123 + api.ios.make_test_build_config({ |
| 118 'xcode version': 'fake xcode version', | 124 'xcode version': 'fake xcode version', |
| 119 'GYP_DEFINES': { | 125 'GYP_DEFINES': { |
| 120 'fake gyp define 1': 'fake value 1', | 126 'fake gyp define 1': 'fake value 1', |
| 121 'fake gyp define 2': 'fake value 2', | 127 'fake gyp define 2': 'fake value 2', |
| 122 'use_goma': '1', | 128 'use_goma': '1', |
| 123 }, | 129 }, |
| 130 'mb_type': 'gyp', |
| 124 'compiler': 'ninja', | 131 'compiler': 'ninja', |
| 125 'configuration': 'Release', | 132 'configuration': 'Release', |
| 126 'sdk': 'iphoneos8.0', | 133 'sdk': 'iphoneos8.0', |
| 127 'tests': [ | 134 'tests': [ |
| 128 ], | 135 ], |
| 129 }) | 136 }) |
| 130 ) | 137 ) |
| 131 | 138 |
| 132 yield ( | 139 yield ( |
| 133 api.test('trybot') | 140 api.test('trybot') |
| 134 + api.platform('mac', 64) | 141 + api.platform('mac', 64) |
| 135 + api.properties( | 142 + api.properties( |
| 136 buildername='ios', | 143 buildername='ios', |
| 137 buildnumber='0', | 144 buildnumber='0', |
| 138 mastername='chromium.fake', | 145 mastername='chromium.fake', |
| 139 slavename='fake-vm', | 146 slavename='fake-vm', |
| 140 path_config='kitchen', | 147 path_config='kitchen', |
| 141 ) | 148 ) |
| 142 + api.ios.make_test_build_config({ | 149 + api.ios.make_test_build_config({ |
| 143 'xcode version': 'fake xcode version', | 150 'xcode version': 'fake xcode version', |
| 144 'GYP_DEFINES': { | 151 'GYP_DEFINES': { |
| 145 'fake gyp define 1': 'fake value 1', | 152 'fake gyp define 1': 'fake value 1', |
| 146 'fake gyp define 2': 'fake value 2', | 153 'fake gyp define 2': 'fake value 2', |
| 147 'use_goma': '1', | 154 'use_goma': '1', |
| 148 }, | 155 }, |
| 149 'use_analyze': 'false', | 156 'use_analyze': 'false', |
| 157 'mb_type': 'gyp', |
| 150 'compiler': 'ninja', | 158 'compiler': 'ninja', |
| 151 'configuration': 'Release', | 159 'configuration': 'Release', |
| 152 'sdk': 'iphoneos8.0', | 160 'sdk': 'iphoneos8.0', |
| 153 'tests': [ | 161 'tests': [ |
| 154 ], | 162 ], |
| 155 }) | 163 }) |
| 156 ) | 164 ) |
| 157 | 165 |
| 158 yield ( | 166 yield ( |
| 159 api.test('test_failure') | 167 api.test('test_failure') |
| 160 + api.platform('mac', 64) | 168 + api.platform('mac', 64) |
| 161 + api.properties(patch_url='patch url') | 169 + api.properties(patch_url='patch url') |
| 162 + api.properties( | 170 + api.properties( |
| 163 buildername='ios', | 171 buildername='ios', |
| 164 buildnumber='0', | 172 buildnumber='0', |
| 165 mastername='chromium.fake', | 173 mastername='chromium.fake', |
| 166 slavename='fake-vm', | 174 slavename='fake-vm', |
| 167 path_config='kitchen', | 175 path_config='kitchen', |
| 168 ) | 176 ) |
| 169 + api.ios.make_test_build_config({ | 177 + api.ios.make_test_build_config({ |
| 170 'xcode version': 'fake xcode version', | 178 'xcode version': 'fake xcode version', |
| 171 'GYP_DEFINES': { | 179 'GYP_DEFINES': { |
| 172 'fake gyp define 1': 'fake value 1', | 180 'fake gyp define 1': 'fake value 1', |
| 173 'fake gyp define 2': 'fake value 2', | 181 'fake gyp define 2': 'fake value 2', |
| 174 }, | 182 }, |
| 183 'mb_type': 'gyp', |
| 175 'compiler': 'xcodebuild', | 184 'compiler': 'xcodebuild', |
| 176 'configuration': 'Debug', | 185 'configuration': 'Debug', |
| 177 'sdk': 'iphonesimulator8.0', | 186 'sdk': 'iphonesimulator8.0', |
| 178 'tests': [ | 187 'tests': [ |
| 179 { | 188 { |
| 180 'app': 'fake tests 1', | 189 'app': 'fake tests 1', |
| 181 'device type': 'fake device', | 190 'device type': 'fake device', |
| 182 'os': '8.0', | 191 'os': '8.0', |
| 183 }, | 192 }, |
| 184 { | 193 { |
| (...skipping 18 matching lines...) Expand all Loading... |
| 203 mastername='chromium.fake', | 212 mastername='chromium.fake', |
| 204 slavename='fake-vm', | 213 slavename='fake-vm', |
| 205 path_config='kitchen', | 214 path_config='kitchen', |
| 206 ) | 215 ) |
| 207 + api.ios.make_test_build_config({ | 216 + api.ios.make_test_build_config({ |
| 208 'xcode version': 'fake xcode version', | 217 'xcode version': 'fake xcode version', |
| 209 'GYP_DEFINES': { | 218 'GYP_DEFINES': { |
| 210 'fake gyp define 1': 'fake value 1', | 219 'fake gyp define 1': 'fake value 1', |
| 211 'fake gyp define 2': 'fake value 2', | 220 'fake gyp define 2': 'fake value 2', |
| 212 }, | 221 }, |
| 222 'mb_type': 'gyp', |
| 213 'compiler': 'ninja', | 223 'compiler': 'ninja', |
| 214 'configuration': 'Debug', | 224 'configuration': 'Debug', |
| 215 'sdk': 'iphonesimulator8.0', | 225 'sdk': 'iphonesimulator8.0', |
| 216 'tests': [ | 226 'tests': [ |
| 217 { | 227 { |
| 218 'app': 'fake tests 1', | 228 'app': 'fake tests 1', |
| 219 'device type': 'fake device', | 229 'device type': 'fake device', |
| 220 'os': '8.0', | 230 'os': '8.0', |
| 221 }, | 231 }, |
| 222 { | 232 { |
| 223 'app': 'fake tests 2', | 233 'app': 'fake tests 2', |
| 224 'device type': 'fake device', | 234 'device type': 'fake device', |
| 225 'os': '7.1', | 235 'os': '7.1', |
| 226 }, | 236 }, |
| 227 ], | 237 ], |
| 228 }) | 238 }) |
| 229 + api.step_data( | 239 + api.step_data( |
| 230 'fake tests 1 (fake device iOS 8.0)', | 240 'fake tests 1 (fake device iOS 8.0)', |
| 231 retcode=2, | 241 retcode=2, |
| 232 ) | 242 ) |
| 233 ) | 243 ) |
| 234 | 244 |
| OLD | NEW |