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

buildbot/buildbot_toolchain_arm_untrusted.sh

Index: buildbot/buildbot_toolchain_arm_untrusted.sh
===================================================================
--- buildbot/buildbot_toolchain_arm_untrusted.sh	(revision 7025)
+++ buildbot/buildbot_toolchain_arm_untrusted.sh	(working copy)
@@ -36,8 +36,8 @@
 fi
 echo "*** ARGUMENTS           : $*"
 
-UTMAN="tools/llvm/utman.sh"
-UTMAN_TEST="tools/llvm/utman-test.sh"
+PNACL_BUILD="pnacl/build.sh"
+PNACL_TEST="pnacl/test.sh"
 
 # On some systems (e.g., windows 64-bit), we must build a 32-bit plugin
 # because the browser is 32-bit. Only sel_ldr and the nexes are 64-bit.
@@ -53,7 +53,7 @@
     ;;
   linux-32-glibc)
     TOOLCHAIN_LABEL=pnacl_linux_i686_glibc
-    UTMAN="tools/llvm/gutman.sh"
+    PNACL_BUILD="pnacl/build-glibc.sh"
     # TODO(pdox): Determine which tests should be run.
     RUN_TESTS=""
     ;;
@@ -65,22 +65,22 @@
     ;;
   linux-64-glibc)
     TOOLCHAIN_LABEL=pnacl_linux_x86_64_glibc
-    UTMAN="tools/llvm/gutman.sh"
+    PNACL_BUILD="pnacl/build-glibc.sh"
     RUN_TESTS=""
     RUN_TESTS="x86-32-glibc x86-32-browser-glibc"
     RUN_TESTS+=" x86-64-glibc x86-64-browser-glibc"
     ;;
   mac-32-newlib)
-    export UTMAN_VERBOSE=true  # To avoid timing out, since this bot is slow.
+    export PNACL_VERBOSE=true  # To avoid timing out, since this bot is slow.
     # We can't test ARM because we do not have QEMU for Mac.
     # We can't test X86-64 because NaCl X86-64 Mac support is not in good shape.
     TOOLCHAIN_LABEL=pnacl_darwin_i386_newlib
     RUN_TESTS="x86-32 x86-32-pic x86-32-browser"
     ;;
   mac-32-glibc)
-    export UTMAN_VERBOSE=true
+    export PNACL_VERBOSE=true
     TOOLCHAIN_LABEL=pnacl_darwin_i386_glibc
-    UTMAN="tools/llvm/gutman.sh"
+    PNACL_BUILD="pnacl/build-glibc.sh"
     # TODO(pdox): Determine which tests should be run.
     RUN_TESTS=""
     ;;
@@ -115,10 +115,11 @@
 rm -rf toolchain/test-log
 
 echo @@@BUILD_STEP show-config@@@
-UTMAN_BUILDBOT=true UTMAN_PRUNE=true ${UTMAN} show-config
+PNACL_BUILDBOT=true PNACL_PRUNE=true ${PNACL_BUILD} show-config
 
 echo @@@BUILD_STEP compile_toolchain@@@
-UTMAN_BUILDBOT=true UTMAN_PRUNE=true ${UTMAN} untrusted_sdk pnacl-toolchain.tgz
+PNACL_BUILDBOT=true PNACL_PRUNE=true \
+  ${PNACL_BUILD} untrusted_sdk pnacl-toolchain.tgz
 chmod a+r pnacl-toolchain.tgz
 
 echo @@@BUILD_STEP untar_toolchain@@@
@@ -148,7 +149,7 @@
 
 for arch in ${RUN_TESTS} ; do
   echo @@@BUILD_STEP test-${arch}@@@
-  UTMAN_BUILDBOT=true ${UTMAN_TEST} test-${arch} ||
+  PNACL_BUILDBOT=true ${PNACL_TEST} test-${arch} ||
       { RETCODE=$? && echo @@@STEP_FAILURE@@@;}
 done