New LLVM merging bots

buildbot/buildbot_selector.py

 #!/usr/bin/python
 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import subprocess
 import sys
 
 python = sys.executable
@@ skipping 69 matching lines @@
     'jaunty_32-newlib-arm_hw-pnacl-dbg':
         'bash buildbot/buildbot_pnacl1.sh mode-buildbot-arm-hw-dbg',
     'jaunty_32-newlib-arm_hw-pnacl-opt':
         'bash buildbot/buildbot_pnacl1.sh mode-buildbot-arm-hw-opt',
     'lucid_64-newlib-x86_32-pnacl':
         'bash buildbot/buildbot_pnacl1.sh mode-buildbot-x8632',
     'lucid_64-newlib-x86_64-pnacl':
         'bash buildbot/buildbot_pnacl1.sh mode-buildbot-x8664',
     # PNaCl Spec
     'lucid_64-newlib-arm_qemu-pnacl-spec':
-        'bash buildbot/buildbot_pnacl2.sh mode-spec-pnacl-arm',
+        'bash buildbot/buildbot_spec2k.sh pnacl-arm',
     'lucid_64-newlib-x86_32-pnacl-spec':
-      'bash buildbot/buildbot_pnacl2.sh mode-spec-pnacl-x8632',
+      'bash buildbot/buildbot_spec2k.sh pnacl-x8632',
     'lucid_64-newlib-x86_64-pnacl-spec':
-      'bash buildbot/buildbot_pnacl2.sh mode-spec-pnacl-x8664',
+      'bash buildbot/buildbot_spec2k.sh pnacl-x8664',
     # NaCl Spec
     'lucid_64-newlib-x86_32-spec':
-      'bash buildbot/buildbot_pnacl2.sh mode-spec-nacl-x8632',
+      'bash buildbot/buildbot_spec2k.sh nacl-x8632',
     'lucid_64-newlib-x86_64-spec':
-      'bash buildbot/buildbot_pnacl2.sh mode-spec-nacl-x8664',
+      'bash buildbot/buildbot_spec2k.sh nacl-x8664',
 
     # Valgrind bots.
     'lucid-64-newlib-dbg-valgrind': 'bash buildbot/buildbot_valgrind.sh newlib',
     'lucid-64-glibc-dbg-valgrind': 'bash buildbot/buildbot_valgrind.sh glibc',
     # Coverage.
     'mac10.6-newlib-coverage': 'bash buildbot/buildbot_coverage_mac.sh',
     'lucid-64-32-newlib-coverage':
         'bash buildbot/buildbot_coverage_linux.sh 32',
     'lucid-64-64-newlib-coverage':
         'bash buildbot/buildbot_coverage_linux.sh 64',
@@ skipping 43 matching lines @@
         'bash buildbot/buildbot_valgrind.sh glibc',
     # Pnacl scons trybots
     'nacl-arm_opt':
         'bash buildbot/buildbot_pnacl1.sh mode-buildbot-arm-try',
     'nacl-arm_hw_opt':
         'bash buildbot/buildbot_pnacl1.sh mode-buildbot-arm-hw-try',
     'nacl-lucid64-pnacl1':
         'bash buildbot/buildbot_pnacl1.sh mode-trybot',
     # Pnacl spec2k trybots
     'nacl-lucid64-pnacl2':
-        'bash buildbot/buildbot_pnacl2.sh mode-spec-pnacl-trybot',
+        'bash buildbot/buildbot_spec2k.sh pnacl-trybot',
 
     # Toolchain glibc.
     'lucid64-glibc': 'bash buildbot/buildbot_lucid64-glibc-makefile.sh',
     'mac-glibc': 'bash buildbot/buildbot_mac-glibc-makefile.sh',
     'win7-glibc': 'buildbot\\buildbot_windows-glibc-makefile.bat',
     # Toolchain gnu.
     'win7-toolchain_x86': 'buildbot\\buildbot_toolchain_win.bat',
     'mac-toolchain_x86': 'bash buildbot/buildbot_toolchain.sh mac',
     'lucid64-toolchain_x86': 'bash buildbot/buildbot_toolchain.sh linux',
     # Pnacl toolchain builders.
@@ skipping 21 matching lines @@
     'nacl-toolchain-win7-glibc':
         'buildbot\\buildbot_windows-glibc-makefile.bat',
 
     'nacl-toolchain-linux-pnacl-x86_32-newlib':
         'bash buildbot/buildbot_toolchain_arm_untrusted.sh linux 32 newlib',
     'nacl-toolchain-linux-pnacl-x86_64-newlib':
         'bash buildbot/buildbot_toolchain_arm_untrusted.sh linux 64 newlib',
     'nacl-toolchain-mac-pnacl-x86_32-newlib':
         'bash buildbot/buildbot_toolchain_arm_untrusted.sh mac 32 newlib',
 
+    # PNaCl LLVM Merging bots
+    'pnacl-merge-slow':
+        'bash buildbot/buildbot_pnacl_merge.sh slow-bot',
+    'pnacl-merge-fast':
+        'bash buildbot/buildbot_pnacl_merge.sh fast-bot',
 }
 
 
 IRT_ARCHIVE_BUILDERS = [
     'lucid-32-newlib-dbg',
     'lucid-64-newlib-dbg',
 ]
 # Require a correspondence with the list above.
 for builder in IRT_ARCHIVE_BUILDERS:
   assert builder in BOT_ASSIGNMENT, builder
 
 
 def Main():
   builder = os.environ.get('BUILDBOT_BUILDERNAME')
   cmd = BOT_ASSIGNMENT.get(builder)
   if not cmd:
     sys.stderr.write('ERROR - unset/invalid builder name\n')
     sys.exit(1)
 
   env = os.environ.copy()
   env['ARCHIVE_IRT'] = builder in IRT_ARCHIVE_BUILDERS and '1' or '0'
 
   print "%s runs: %s\n" % (builder, cmd)
   retcode = subprocess.call(cmd, env=env, shell=True)
   sys.exit(retcode)
 
 
 if __name__ == '__main__':
   Main()