Part 2 of 3: Moving tools/llvm to pnacl/

tests/spec2k/run_all.sh

 #!/bin/bash
 
 # 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.
 
 set -o nounset
 set -o errexit
 
 # The script is located in "native_client/tests/spec2k"
 # Set pwd to spec2k/
 cd "$(dirname "$0")"
 if [[ $(basename "$(pwd)") != "spec2k" ]] ; then
   echo "ERROR: cannot find the spec2k/ directory"
   exit -1
 fi
-source ../../tools/llvm/common-tools.sh
+
+# TODO(pdox): Remove this dependency.
+source ../../pnacl/scripts/common-tools.sh
 readonly NACL_ROOT="$(GetAbsolutePath "../../")"
 SetScriptPath "$(pwd)/run_all.sh"
 SetLogDirectory "${NACL_ROOT}/toolchain/test-log"
 
 ######################################################################
 # CONFIGURATION
 ######################################################################
 # TODO(robertm): make this configurable from the commandline
 
 readonly LIST_INT_C="164.gzip 175.vpr 176.gcc 181.mcf 186.crafty 197.parser \
@@ skipping 471 matching lines @@
   shift 1
   for platform in ${platforms} ; do
     echo "build-libs-nacl: scons build_lib [${platform}] $*"
     (cd ${NACL_ROOT};
       ${SCONS_COMMON} platform=${platform} build_lib "$@")
   done
 }
 
 build-libs-pnacl() {
   pushd "${NACL_ROOT}"
-  tools/llvm/utman.sh sdk
+  pnacl/build.sh sdk
   popd
 }
 
 #@
 #@ CleanBenchmarks <benchmark>*
 #@
 #@   this is a deep clean and you have to rerun PoplateFromSpecHarness
 CleanBenchmarks() {
   local list=$(GetBenchmarkList "$@")
   rm -rf bin/
@@ skipping 280 matching lines @@
 
 [ $# = 0 ] && set -- help  # Avoid reference to undefined $1.
 
 if [ "$(type -t $1)" != "function" ]; then
   Usage
   echo "ERROR: unknown mode '$1'." >&2
   exit 1
 fi
 
 "$@"