Add support for nacl-clang bots

build_tools/buildbot_selector.sh

 #!/bin/bash
 # Copyright (c) 2012 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.
 
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Main entry point for buildbots.
 # For local testing set BUILDBOT_BUILDERNAME and TEST_BUILDBOT, e.g:
@@ skipping 79 matching lines @@
       readonly TRYBOT=1
       readonly NIGHTLY=0
     elif [ "${PREFIX}" = "nightly-" ]; then
       readonly TRYBOT=0
       readonly NIGHTLY=1
     else
       readonly TRYBOT=0
       readonly NIGHTLY=0
     fi
     readonly OS=${BASH_REMATCH[2]}
-    readonly LIBC=${BASH_REMATCH[3]}
+    readonly BOT_TYPE=${BASH_REMATCH[3]}
     readonly SHARD=${BASH_REMATCH[4]}
   else
     echo "Bad BUILDBOT_BUILDERNAME: ${BUILDBOT_BUILDERNAME}" 1>&2
     exit 1
   fi
 
   # Don't upload periodic or trybot builds.
   if [ "${TRYBOT}" = "1" -o "${NIGHTLY}" = "1" ]; then
     NACLPORTS_NO_UPLOAD=1
   fi
 
   # Select platform specific things.
   if [ "${OS}" = "win" ]; then
     PYTHON=python.bat
   fi
 
-  # Select libc
-  if [ "${LIBC}" = "glibc" ]; then
-    TOOLCHAIN=glibc
-  elif [ "${LIBC}" = "newlib" ]; then
-    TOOLCHAIN=newlib
-  elif [ "${LIBC}" = "pnacl_newlib" ]; then
+  # Convert toolchain contains in the bot name to valid TOOLCHAIN value
+  # as expected by the SDK tools.
+  # TODO(sbc): remove this first case once that bot names contain 'pnacl'
+  # rather than 'pancl_newlib'.
+  if [ "${BOT_TYPE}" = "pnacl_newlib" ]; then
     TOOLCHAIN=pnacl
-  elif [ "${LIBC}" = "bionic" ]; then
-    TOOLCHAIN=bionic
+  elif [ "${BOT_TYPE}" = "clang" ]; then
+    TOOLCHAIN=clang-newlib
   else
-    echo "Bad LIBC: ${LIBC}" 1>&2
-    exit 1
+    TOOLCHAIN=${BOT_TYPE}
   fi
 
   # Select shard count
   if [ "${OS}" = "mac" ]; then
     SHARDS=2
   elif [ "${OS}" = "linux" ]; then
-    if [ "${TOOLCHAIN}" = "glibc" ]; then
+    if [ "${TOOLCHAIN}" = "bionic" ]; then
+      SHARDS=1
+    else
       SHARDS=5
-    elif [ "${TOOLCHAIN}" = "newlib" ]; then
-      SHARDS=5
-    elif [ "${TOOLCHAIN}" = "bionic" ]; then
-      SHARDS=1
-    elif [ "${TOOLCHAIN}" = "pnacl" ]; then
-      SHARDS=5
-    else
-      echo "Unspecified sharding for TOOLCHAIN: ${TOOLCHAIN}" 1>&2
     fi
   else
     echo "Unspecified sharding for OS: ${OS}" 1>&2
   fi
 
   # For the trybots we have 5 shards for each toolchain
   if [ "${TRYBOT}" = "1" ]; then
     SHARDS=5
   fi
 fi
@@ skipping 71 matching lines @@
   Publish
 fi
 
 echo "@@@BUILD_STEP Summary@@@"
 if [ "${RESULT}" != "0" ] ; then
   echo "@@@STEP_FAILURE@@@"
   echo -e "${MESSAGES}"
 fi
 
 exit ${RESULT}