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 }, |
63 'compiler': 'ninja', | 68 'compiler': 'ninja', |
ehmaldonado_chromium
2016/08/11 09:39:11
Shouldn't there be a 'mb_type': 'gyp' here as well
kjellander_chromium
2016/08/11 09:49:58
Good catch! Updated in PS#2.
| |
64 'configuration': 'Debug', | 69 'configuration': 'Debug', |
65 'sdk': 'iphonesimulator8.0', | 70 'sdk': 'iphonesimulator8.0', |
66 'tests': [ | 71 'tests': [ |
67 { | 72 { |
68 'app': 'fake tests 1', | 73 'app': 'fake tests 1', |
69 'device type': 'fake device', | 74 'device type': 'fake device', |
70 'os': '8.0', | 75 'os': '8.0', |
71 }, | 76 }, |
72 { | 77 { |
73 'app': 'fake tests 2', | 78 'app': 'fake tests 2', |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
114 slavename='fake-vm', | 119 slavename='fake-vm', |
115 path_config='kitchen', | 120 path_config='kitchen', |
116 ) | 121 ) |
117 + api.ios.make_test_build_config({ | 122 + api.ios.make_test_build_config({ |
118 'xcode version': 'fake xcode version', | 123 'xcode version': 'fake xcode version', |
119 'GYP_DEFINES': { | 124 'GYP_DEFINES': { |
120 'fake gyp define 1': 'fake value 1', | 125 'fake gyp define 1': 'fake value 1', |
121 'fake gyp define 2': 'fake value 2', | 126 'fake gyp define 2': 'fake value 2', |
122 'use_goma': '1', | 127 'use_goma': '1', |
123 }, | 128 }, |
129 'mb_type': 'gyp', | |
124 'compiler': 'ninja', | 130 'compiler': 'ninja', |
125 'configuration': 'Release', | 131 'configuration': 'Release', |
126 'sdk': 'iphoneos8.0', | 132 'sdk': 'iphoneos8.0', |
127 'tests': [ | 133 'tests': [ |
128 ], | 134 ], |
129 }) | 135 }) |
130 ) | 136 ) |
131 | 137 |
132 yield ( | 138 yield ( |
133 api.test('trybot') | 139 api.test('trybot') |
134 + api.platform('mac', 64) | 140 + api.platform('mac', 64) |
135 + api.properties( | 141 + api.properties( |
136 buildername='ios', | 142 buildername='ios', |
137 buildnumber='0', | 143 buildnumber='0', |
138 mastername='chromium.fake', | 144 mastername='chromium.fake', |
139 slavename='fake-vm', | 145 slavename='fake-vm', |
140 path_config='kitchen', | 146 path_config='kitchen', |
141 ) | 147 ) |
142 + api.ios.make_test_build_config({ | 148 + api.ios.make_test_build_config({ |
143 'xcode version': 'fake xcode version', | 149 'xcode version': 'fake xcode version', |
144 'GYP_DEFINES': { | 150 'GYP_DEFINES': { |
145 'fake gyp define 1': 'fake value 1', | 151 'fake gyp define 1': 'fake value 1', |
146 'fake gyp define 2': 'fake value 2', | 152 'fake gyp define 2': 'fake value 2', |
147 'use_goma': '1', | 153 'use_goma': '1', |
148 }, | 154 }, |
149 'use_analyze': 'false', | 155 'use_analyze': 'false', |
156 'mb_type': 'gyp', | |
150 'compiler': 'ninja', | 157 'compiler': 'ninja', |
151 'configuration': 'Release', | 158 'configuration': 'Release', |
152 'sdk': 'iphoneos8.0', | 159 'sdk': 'iphoneos8.0', |
153 'tests': [ | 160 'tests': [ |
154 ], | 161 ], |
155 }) | 162 }) |
156 ) | 163 ) |
157 | 164 |
158 yield ( | 165 yield ( |
159 api.test('test_failure') | 166 api.test('test_failure') |
160 + api.platform('mac', 64) | 167 + api.platform('mac', 64) |
161 + api.properties(patch_url='patch url') | 168 + api.properties(patch_url='patch url') |
162 + api.properties( | 169 + api.properties( |
163 buildername='ios', | 170 buildername='ios', |
164 buildnumber='0', | 171 buildnumber='0', |
165 mastername='chromium.fake', | 172 mastername='chromium.fake', |
166 slavename='fake-vm', | 173 slavename='fake-vm', |
167 path_config='kitchen', | 174 path_config='kitchen', |
168 ) | 175 ) |
169 + api.ios.make_test_build_config({ | 176 + api.ios.make_test_build_config({ |
170 'xcode version': 'fake xcode version', | 177 'xcode version': 'fake xcode version', |
171 'GYP_DEFINES': { | 178 'GYP_DEFINES': { |
172 'fake gyp define 1': 'fake value 1', | 179 'fake gyp define 1': 'fake value 1', |
173 'fake gyp define 2': 'fake value 2', | 180 'fake gyp define 2': 'fake value 2', |
174 }, | 181 }, |
182 'mb_type': 'gyp', | |
175 'compiler': 'xcodebuild', | 183 'compiler': 'xcodebuild', |
176 'configuration': 'Debug', | 184 'configuration': 'Debug', |
177 'sdk': 'iphonesimulator8.0', | 185 'sdk': 'iphonesimulator8.0', |
178 'tests': [ | 186 'tests': [ |
179 { | 187 { |
180 'app': 'fake tests 1', | 188 'app': 'fake tests 1', |
181 'device type': 'fake device', | 189 'device type': 'fake device', |
182 'os': '8.0', | 190 'os': '8.0', |
183 }, | 191 }, |
184 { | 192 { |
(...skipping 18 matching lines...) Expand all Loading... | |
203 mastername='chromium.fake', | 211 mastername='chromium.fake', |
204 slavename='fake-vm', | 212 slavename='fake-vm', |
205 path_config='kitchen', | 213 path_config='kitchen', |
206 ) | 214 ) |
207 + api.ios.make_test_build_config({ | 215 + api.ios.make_test_build_config({ |
208 'xcode version': 'fake xcode version', | 216 'xcode version': 'fake xcode version', |
209 'GYP_DEFINES': { | 217 'GYP_DEFINES': { |
210 'fake gyp define 1': 'fake value 1', | 218 'fake gyp define 1': 'fake value 1', |
211 'fake gyp define 2': 'fake value 2', | 219 'fake gyp define 2': 'fake value 2', |
212 }, | 220 }, |
221 'mb_type': 'gyp', | |
213 'compiler': 'ninja', | 222 'compiler': 'ninja', |
214 'configuration': 'Debug', | 223 'configuration': 'Debug', |
215 'sdk': 'iphonesimulator8.0', | 224 'sdk': 'iphonesimulator8.0', |
216 'tests': [ | 225 'tests': [ |
217 { | 226 { |
218 'app': 'fake tests 1', | 227 'app': 'fake tests 1', |
219 'device type': 'fake device', | 228 'device type': 'fake device', |
220 'os': '8.0', | 229 'os': '8.0', |
221 }, | 230 }, |
222 { | 231 { |
223 'app': 'fake tests 2', | 232 'app': 'fake tests 2', |
224 'device type': 'fake device', | 233 'device type': 'fake device', |
225 'os': '7.1', | 234 'os': '7.1', |
226 }, | 235 }, |
227 ], | 236 ], |
228 }) | 237 }) |
229 + api.step_data( | 238 + api.step_data( |
230 'fake tests 1 (fake device iOS 8.0)', | 239 'fake tests 1 (fake device iOS 8.0)', |
231 retcode=2, | 240 retcode=2, |
232 ) | 241 ) |
233 ) | 242 ) |
234 | 243 |
OLD | NEW |