OLD | NEW |
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 from master import master_config | 5 from master import master_config |
6 from master.factory import chromium_factory | 6 from master.factory import chromium_factory |
7 | 7 |
8 defaults = {} | 8 defaults = {} |
9 | 9 |
10 helper = master_config.Helper(defaults) | 10 helper = master_config.Helper(defaults) |
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
303 # iOS Release iphoneos BuilderTester | 303 # iOS Release iphoneos BuilderTester |
304 # | 304 # |
305 B('iOS Device', 'ios_rel', gatekeeper='ios_rel', scheduler='ios', | 305 B('iOS Device', 'ios_rel', gatekeeper='ios_rel', scheduler='ios', |
306 auto_reboot=True, notify_on_missing=True) | 306 auto_reboot=True, notify_on_missing=True) |
307 F('ios_rel', ios().ChromiumFactory( | 307 F('ios_rel', ios().ChromiumFactory( |
308 # TODO(lliabraa): Need to upstream support for running tests on devices | 308 # TODO(lliabraa): Need to upstream support for running tests on devices |
309 # before we can actually run any tests. | 309 # before we can actually run any tests. |
310 clobber=True, | 310 clobber=True, |
311 tests=[], | 311 tests=[], |
312 options = [ | 312 options = [ |
313 '--', '-project', '../build/all.xcodeproj', '-sdk', | 313 '--', '-project', '../build/all.xcodeproj', |
314 'iphoneos6.1', '-target' , 'All'], | 314 # Use 'iphoneos6.1' sdk for Xcode 4.6 and 'iphoneos' for Xcode 5. |
| 315 '-sdk', 'iphoneos6.1', '-target' , 'All'], |
315 factory_properties={ | 316 factory_properties={ |
316 'app_name': 'Chromium.app', | 317 'app_name': 'Chromium.app', |
317 'gclient_deps': 'ios', | 318 'gclient_deps': 'ios', |
318 'gclient_env': { | 319 'gclient_env': { |
319 'GYP_DEFINES': 'component=static_library OS=ios chromium_ios_signing=0', | 320 'GYP_DEFINES': 'component=static_library OS=ios chromium_ios_signing=0', |
320 'GYP_GENERATOR_FLAGS': 'xcode_project_version=3.2', | 321 'GYP_GENERATOR_FLAGS': 'xcode_project_version=3.2', |
321 }, | 322 }, |
322 })) | 323 })) |
323 | 324 |
324 # | 325 # |
(...skipping 22 matching lines...) Expand all Loading... |
347 'test_platform': 'ios-simulator', | 348 'test_platform': 'ios-simulator', |
348 'gclient_deps': 'ios', | 349 'gclient_deps': 'ios', |
349 'gclient_env': { | 350 'gclient_env': { |
350 'GYP_DEFINES': 'component=static_library OS=ios chromium_ios_signing=0', | 351 'GYP_DEFINES': 'component=static_library OS=ios chromium_ios_signing=0', |
351 'GYP_GENERATOR_FLAGS': 'xcode_project_version=3.2', | 352 'GYP_GENERATOR_FLAGS': 'xcode_project_version=3.2', |
352 }, | 353 }, |
353 })) | 354 })) |
354 | 355 |
355 def Update(config, active_master, c): | 356 def Update(config, active_master, c): |
356 return helper.Update(c) | 357 return helper.Update(c) |
OLD | NEW |