Added arguments to NaCl scons to allow custom toolchain directories.

buildbot/buildbot_pnacl_toolchain_tests.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.
 
 # Run toolchain torture tests and llvm testsuite tests.
 # For now, run on linux64, build and run unsandboxed newlib tests
 # for all 3 architectures.
 # Note: This script builds the toolchain from scratch but does
 #       not build the translators and hence the translators
@@ skipping 39 matching lines @@
 # by uncommenting below:
 # export BUILD_ARCH="x86_32"
 # export HOST_ARCH="x86_32"
 # TODO(pnacl-team): Figure out what to do about this.
 # Export this so that the test scripts know where to find the toolchain.
 export TOOLCHAIN_BASE_DIR=linux_x86
 export PNACL_TOOLCHAIN_DIR=${TOOLCHAIN_BASE_DIR}/pnacl_newlib
 export PNACL_TOOLCHAIN_LABEL=pnacl_linux_x86
 # This picks the TC which we just built, even if scons doesn't know
 # how to find a 64-bit host toolchain.
-readonly SCONS_PICK_TC="pnaclsdk_mode=custom:toolchain/${PNACL_TOOLCHAIN_DIR}"
+readonly SCONS_PICK_TC="pnacl_newlib_dir=toolchain/${PNACL_TOOLCHAIN_DIR}"
 
 # download-old-tc -
 # Download the archived frontend toolchain, if we haven't already
 download-old-tc() {
   local dst=$1
 
   if [[ -f "${dst}/${ARCHIVED_TOOLCHAIN_REV}.stamp" ]]; then
     echo "Using existing tarball for archived frontend"
   else
     mkdir -p "${dst}"
@@ skipping 148 matching lines @@
   # If the correct cached frontend is in place, the hash will match and the
   # download will be a no-op. Otherwise the downloader will fix it.
   download-old-tc toolchain/${TOOLCHAIN_BASE_DIR}/archived_tc
 
   # Save the current toolchain.
   mkdir -p toolchain/${TOOLCHAIN_BASE_DIR}/current_tc
   rm -rf toolchain/${TOOLCHAIN_BASE_DIR}/current_tc/*
   mv toolchain/${PNACL_TOOLCHAIN_DIR} \
     toolchain/${TOOLCHAIN_BASE_DIR}/current_tc/${PNACL_TOOLCHAIN_LABEL}
 
-  # Link the old frontend into place. If we just use pnaclsdk_mode to select a
-  # different toolchain, SCons will attempt to rebuild the IRT.
+  # Link the old frontend into place. If we select a different toolchain,
+  # SCons will attempt to rebuild the IRT.
   ln -s archived_tc/${PNACL_TOOLCHAIN_LABEL} toolchain/${PNACL_TOOLCHAIN_DIR}
 
   # Build the pexes with the old frontend.
   ${SCONS_COMMON} ${SCONS_PICK_TC} \
     do_not_run_tests=1 ${flags} ${targets} || handle-error
 
   # Put the current toolchain back in place.
   rm toolchain/${PNACL_TOOLCHAIN_DIR}
   mv toolchain/${TOOLCHAIN_BASE_DIR}/current_tc/${PNACL_TOOLCHAIN_LABEL} \
     toolchain/${PNACL_TOOLCHAIN_DIR}
@@ skipping 122 matching lines @@
   done
 }
 
 
 if [ $# = 0 ]; then
   # NOTE: this is used for manual testing only
   tc-test-bot "x86-64 x86-32 arm"
 else
   "$@"
 fi