Add split builder/tester android trybot target

masters/master.tryserver.chromium/master.cfg

Index: masters/master.tryserver.chromium/master.cfg
diff --git a/masters/master.tryserver.chromium/master.cfg b/masters/master.tryserver.chromium/master.cfg
index 8144645af4a1b9074984ed188440ec34906a9055..3a504a1aa1f2ea0967b2ca6716e45b5dc13a56cc 100644
--- a/masters/master.tryserver.chromium/master.cfg
+++ b/masters/master.tryserver.chromium/master.cfg
@@ -7,6 +7,8 @@
 # READ THIS:
 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure
 
+from buildbot.scheduler import Triggerable
+
 # These modules come from scripts, which must be in the PYTHONPATH.
 from master import master_utils
 from master import slaves_list
@@ -84,8 +86,7 @@ def CreateBuilder(platform, builder_name, target,
                   gclient_env=None, gyp_generators=None,
                   factory_properties=None):
   """Generates and register a builder along with its slave(s)."""
-  if platform not in ('win32', 'win64', 'linux', 'mac',
-                      'android', 'android_test'):
+  if platform not in ('win32', 'win64', 'linux', 'mac', 'android'):
     raise Exception(platform + ' is not a known os type')
 
   factory_properties = (factory_properties or {}).copy()
@@ -122,10 +123,12 @@ def CreateBuilder(platform, builder_name, target,
     factory_properties['gclient_env']['GYP_DEFINES'] = 'fastbuild=1'
   elif platform == 'android':
     factory = m_chromium_android
-    annotation_script = 'src/build/android/buildbot_try_compile.sh'
-  elif platform == 'android_test':
-    factory = m_chromium_android
-    annotation_script = 'src/build/android/buildbot_try_compile_test.sh'
+    if builder_name == 'android':
+      annotation_script = 'src/build/android/buildbot_try_compile.sh'
+    elif builder_name == 'android_compiler':
+      annotation_script = 'src/build/android/buildbot_try_compiler.sh'

[M-A Ruel, 2012/07/14 22:32:50]

the difference it really subtle :(

[Isaac (away), 2012/07/16 10:00:10]

yes it is, and the scripts are very similar too...  I didn't want to combine
them in case we needed to turn one into an 'exit 0' no-op.

try_compile.sh will be deprecated soon.

+    else:
+      annotation_script = 'src/build/android/buildbot_try_tester.sh'
   elif platform == 'mac':
     factory = m_chromium_mac
     factory_properties['gclient_env']['GYP_DEFINES'] = 'fastbuild=1'
@@ -599,9 +602,16 @@ b_android = CreateBuilder(platform='android',
                           target='Release',
                           builder_name='android')
 
-b_android_test = CreateBuilder(platform='android_test',
-                               target='Release',
-                               builder_name='android_test')
+b_android_compiler = CreateBuilder(platform='android',
+                                   target='Release',
+                                   builder_name='android_compiler',
+                                   factory_properties={'trigger': 'android'})
+
+b_android_tester = CreateBuilder(platform='android',
+                                 target='Release',
+                                 builder_name='android_tester',
+                                 factory_properties={
+                                     'halt_on_missing_build': True})
 
 # 32 bits tools can't link libwebcore.a anymore due to lack of virtual address
 # space, including OSX 10.5.
@@ -1311,7 +1321,8 @@ arm_gclient_env = {
 c['builders'] = [
   b_linux_rel, b_linux_rel_alt, b_mac_rel, b_win_rel,
   b_linux_clang,
-  b_linux, b_mac, b_win, b_android, b_android_test,
+  b_linux, b_mac, b_win,
+  b_android, b_android_compiler, b_android_tester,
   b_win_vs2010_rel, b_win_vs2010,
   b_chromium_chromiumos,
   b_valgrind_linux, b_valgrind_mac,
@@ -1392,6 +1403,10 @@ if LISTEN_TO_SVN:
       code_review_sites=code_review_sites,
       pools=pools))
 
+# Triggerable scheduler for Android Builder

[cmp, 2012/07/16 17:29:24]

nit: append period to end of sentence

+c['schedulers'].append(Triggerable(
+    name='android',
+    builderNames=['android_tester']))
 
 ####### STATUS TARGETS