Added arguments to NaCl scons to allow custom toolchain directories.

buildbot/buildbot_pnacl.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.
 
 set -o xtrace
 set -o nounset
 set -o errexit
 
 # Tell build.sh and test.sh that we're a bot.
@@ skipping 489 matching lines @@
 
 mode-buildbot-arm-hw-try() {
   unarchive-for-hw-bots $(NAME_ARM_TRY_DOWNLOAD)  try
   mode-buildbot-arm-hw
 }
 
 # These 2 functions are also suitable for local TC sanity testing.
 tc-tests-all() {
   local is_try=$1
 
-  local label="pnaclsdk_mode=custom:toolchain/${PNACL_TOOLCHAIN_DIR}"
+  local label="pnacl_newlib_dir=toolchain/${PNACL_TOOLCHAIN_DIR}"
   local scons_flags="-k skip_trusted_tests=1 -j8 ${label}"
 
   llvm-regression
 
   # newlib
   for arch in x86-32 x86-64 arm; do
     ${DRIVER_TESTS} --platform="$arch"
     scons-stage-noirt "$arch" "${scons_flags}" "${SCONS_TC_TESTS}"
     # Large tests cannot be run in parallel
     scons-stage-noirt "$arch" "${scons_flags} -j1" "large_tests"
@@ skipping 225 matching lines @@
   exit 1
 fi
 
 "$@"
 
 if [[ ${RETCODE} != 0 ]]; then
   echo "@@@BUILD_STEP summary@@@"
   echo There were failed stages.
   exit ${RETCODE}
 fi