Chromium Code Reviews| 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 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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', '-sdk', |
| 314 'iphoneos6.1', '-target' , 'All'], | 314 # 'iphoneos', '-target' , 'All'], # for xcode 5 |
|
smut
2013/11/19 23:49:20
Is upstream still on Xcode 4.6? Just remove this l
| |
| 315 'iphoneos6.1', '-target' , 'All'], # for xcode 4.6 | |
| 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 |
| 325 B('iOS Device ninja', 'ios_rel_ninja', gatekeeper='ios_rel_ninja', | |
| 326 scheduler='ios', auto_reboot=True, notify_on_missing=True) | |
| 327 F('ios_rel_ninja', mac_out().ChromiumFactory( | |
| 328 tests=[], | |
| 329 options=['--build-tool=ninja'], | |
| 330 factory_properties={ | |
| 331 'app_name': 'Chromium.app', | |
| 332 'gclient_deps': 'ios', | |
| 333 'gclient_env': { | |
| 334 'GYP_CROSSCOMPILE': '1', | |
| 335 'GYP_GENERATORS': 'ninja', | |
| 336 'GYP_DEFINES': 'component=static_library OS=ios clang=1', | |
| 337 }, | |
| 338 })) | |
| 339 | |
| 324 # | 340 # |
| 325 # iOS Debug iphonesimulator BuilderTester | 341 # iOS Debug iphonesimulator BuilderTester |
| 326 # | 342 # |
| 327 B('iOS Simulator (dbg)', 'ios_dbg', gatekeeper='ios_dbg', scheduler='ios', | 343 B('iOS Simulator (dbg)', 'ios_dbg', gatekeeper='ios_dbg', scheduler='ios', |
| 328 auto_reboot=True, notify_on_missing=True) | 344 auto_reboot=True, notify_on_missing=True) |
| 329 F('ios_dbg', ios().ChromiumFactory( | 345 F('ios_dbg', ios().ChromiumFactory( |
| 330 clobber=True, | 346 clobber=True, |
| 331 target='Debug', | 347 target='Debug', |
| 332 tests=[ | 348 tests=[ |
| 333 'base_unittests', | 349 'base_unittests', |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 347 'test_platform': 'ios-simulator', | 363 'test_platform': 'ios-simulator', |
| 348 'gclient_deps': 'ios', | 364 'gclient_deps': 'ios', |
| 349 'gclient_env': { | 365 'gclient_env': { |
| 350 'GYP_DEFINES': 'component=static_library OS=ios chromium_ios_signing=0', | 366 'GYP_DEFINES': 'component=static_library OS=ios chromium_ios_signing=0', |
| 351 'GYP_GENERATOR_FLAGS': 'xcode_project_version=3.2', | 367 'GYP_GENERATOR_FLAGS': 'xcode_project_version=3.2', |
| 352 }, | 368 }, |
| 353 })) | 369 })) |
| 354 | 370 |
| 355 def Update(config, active_master, c): | 371 def Update(config, active_master, c): |
| 356 return helper.Update(c) | 372 return helper.Update(c) |
| OLD | NEW |