Index: masters/master.chromium.fyi/master.cfg |
diff --git a/masters/master.chromium.fyi/master.cfg b/masters/master.chromium.fyi/master.cfg |
index 3b95553874053de506050313655c49f30071d7e1..ad798284193fd7f4858741d6d4afae91e768b3e5 100644 |
--- a/masters/master.chromium.fyi/master.cfg |
+++ b/masters/master.chromium.fyi/master.cfg |
@@ -328,6 +328,7 @@ def win_out(): return F('src/out', 'win32') |
def mac(): return F('src/xcodebuild', 'darwin') |
def linux(**kwargs): return F('src/out', 'linux2', **kwargs) |
def ios(): return F('src/xcodebuild', 'darwin') |
+def mac_out(): return F('src/out', 'darwin') |
ghost stip (do not use)
2013/12/05 21:04:25
I don't think you need this?
|
def codesearch(): |
return F('src/build', 'linux2', pull_internal=False, full_checkout=True, |
@@ -1318,6 +1319,23 @@ f_chromium_rel_ios_device = ios().ChromiumFactory( |
}, |
}) |
+f_chromium_rel_ninja_ios_device = ios().ChromiumFactory( |
+ clobber=True, |
+ # TODO(lliabraa): Need to upstream support for running tests on devices |
+ # before we can actually run any tests. |
+ tests=[], |
+ options = ['--build-tool=ninja'], |
+ factory_properties={ |
+ 'app_name': 'Chromium.app', |
+ 'gclient_deps': 'ios', |
+ 'gclient_env': { |
+ 'GYP_CROSSCOMPILE': '1', |
+ 'GYP_GENERATORS': 'ninja', |
+ 'GYP_DEFINES': 'component=static_library OS=ios clang=1', |
+ }, |
+ }) |
+ |
+ |
f_chromium_linux_goma_canary = linux().ChromiumFactory( |
slave_type='BuilderTester', |
target='Release', |
@@ -1962,6 +1980,13 @@ b_chromium_rel_ios_device = { |
'auto_reboot': False, |
} |
+b_chromium_rel_ninja_ios_device = { |
+ 'name': 'Chromium iOS Device (ninja)', |
+ 'factory': f_chromium_rel_ninja_ios_device, |
+ 'category': 'ios', |
+ 'auto_reboot': False, |
+} |
+ |
b_chromium_rel_linux_browser_valgrind_builder = { |
'name': 'Chromium Linux Browser Builder (valgrind)', |
'builddir': 'chromium-rel-linux-browser-valgrind-builder', |
@@ -2247,6 +2272,7 @@ c['builders'] = [ |
# iOS |
b_chromium_dbg_ios_simulator, |
b_chromium_rel_ios_device, |
+ b_chromium_rel_ninja_ios_device, |
# TSAN |
b_chromium_dbg_win_tsan, |
@@ -2330,7 +2356,7 @@ master_utils.VerifySetup(c, slaves) |
# Buildbot master url: |
# Must come before AutoSetupMaster(). |
-c['buildbotURL'] = 'http://build.chromium.org/p/chromium.fyi/' |
+c['buildbotURL'] = ActiveMaster.buildbot_url |
ghost stip (do not use)
2013/12/05 21:04:25
in general a good idea to make this change in a se
pgervais
2013/12/05 21:44:13
There are actually two of these modifications in t
|
# Adds common status and tools to this master. |
master_utils.AutoSetupMaster(c, ActiveMaster, |