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

pnacl/test.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.
 #
 #@                   PNaCl Test Helper
 #@-------------------------------------------------------------------
 #@
 #@ SCons Test Usage:
 #@
-#@   utman-test.sh test-<arch>-<mode> [extra_arguments_to_scons]
+#@   test.sh test-<arch>-<mode> [extra_arguments_to_scons]
 #@
 #@      Runs the SCons tests with selected arch and mode.
 #@      Valid arches:
 #@          x86-32
 #@          x86-64
 #@          arm
 #@      Available modes:
 #@          newlib (same as omitting mode)
 #@          pic
 #@          sbtc
 #@          glibc
 #@          browser
 #@          browser-glibc
 #@
-#@      For example: tools/llvm/utman-test.sh test-x86-32-glibc
+#@      For example: test.sh test-x86-32-glibc
 #@
-#@ The env variables: UTMAN_CONCURRENCY, UTMAN_BUILDBOT, UTMAN_DEBUG
+#@ The env variables: PNACL_CONCURRENCY, PNACL_BUILDBOT, PNACL_DEBUG
 #@ control behavior of this script
 #@
 #@
 
 ######################################################################
 # Config
 ######################################################################
 
 set -o nounset
 set -o errexit
 
-# The script is located in "native_client/tools/llvm".
+# The script is located in "pnacl/".
 # Set pwd to native_client/
-cd "$(dirname "$0")"/../..
+cd "$(dirname "$0")"/..
 if [[ $(basename "$(pwd)") != "native_client" ]] ; then
   echo "ERROR: cannot find native_client/ directory"
   exit -1
 fi
 readonly NACL_ROOT="$(pwd)"
 
 readonly DRYRUN=${DRYRUN:-false}
 
 # This is only used by Spec2K test scripts.
 readonly PNACL_LIBMODE=${LIBMODE:-newlib}
 export PNACL_LIBMODE
 
-source tools/llvm/common-tools.sh
-SetScriptPath "${NACL_ROOT}/tools/llvm/utman-test.sh"
+source pnacl/scripts/common-tools.sh
+SetScriptPath "${NACL_ROOT}/pnacl/test.sh"
 SetLogDirectory "${NACL_ROOT}/toolchain/test-log"
 
 # For different levels of make parallelism change this in your env
-readonly UTMAN_CONCURRENCY=${UTMAN_CONCURRENCY:-8}
+readonly PNACL_CONCURRENCY=${PNACL_CONCURRENCY:-8}
 
 readonly OTHER_TEST_SCRIPT="${NACL_ROOT}/buildbot/buildbot_pnacl.sh"
 
 ######################################################################
 ######################################################################
 #
 #   < TESTING >
 #
 ######################################################################
 ######################################################################
 
 # TODO(robertm): figure out what to do about concurrency in debug mode.
-# Perhaps it is fine just tweaking that via UTMAN_CONCURRENCY.
-if ${UTMAN_DEBUG} || ${UTMAN_BUILDBOT}; then
+# Perhaps it is fine just tweaking that via PNACL_CONCURRENCY.
+if ${PNACL_DEBUG} || ${PNACL_BUILDBOT}; then
   readonly SCONS_ARGS=(MODE=nacl,opt-host
                        bitcode=1
                        --verbose
-                       -j${UTMAN_CONCURRENCY})
+                       -j${PNACL_CONCURRENCY})
 else
   readonly SCONS_ARGS=(MODE=nacl,opt-host
                        bitcode=1
                        naclsdk_validate=0
                        sysinfo=0
-                       -j${UTMAN_CONCURRENCY})
+                       -j${PNACL_CONCURRENCY})
 fi
 
 #@ show-tests            - see what tests can be run
 show-tests() {
   StepBanner "SHOWING TESTS"
   cat $(find tests -name nacl.scons) | grep -o 'run_[A-Za-z_-]*' | sort | uniq
 }
 
 Run() {
   if ${DRYRUN}; then
@@ skipping 128 matching lines @@
 test-x86-64-browser-glibc() { browser-tests "x86-64" "--nacl_glibc" ; }
 
 #@
 #@ test-all  - Run arm, x86-32, and x86-64 tests. (all should pass)
 test-all() {
   if [ $# -ne 0 ]; then
     echo "test-all does not take any arguments"
     exit -1
   fi
 
-  FAIL_FAST=true ${OTHER_TEST_SCRIPT} mode-test-all ${UTMAN_CONCURRENCY}
+  FAIL_FAST=true ${OTHER_TEST_SCRIPT} mode-test-all ${PNACL_CONCURRENCY}
 }
 
 #@
 #@ test-spec <official-spec-dir> <setup> [ref|train] [<benchmarks>]*
 #@                       - run spec tests
 test-spec() {
   if [[ $# -lt 2 ]]; then
     echo "not enough arguments for test-spec"
     exit 1
   fi;
@@ skipping 86 matching lines @@
 [ $# = 0 ] && set -- help  # Avoid reference to undefined $1.
 if [ "$(type -t $1)" != "function" ]; then
   #Usage
   echo "ERROR: unknown function '$1'." >&2
   echo "For help, try:"
   echo "    $0 help"
   exit 1
 fi
 
 "$@"