Activate buildbot, lucid64-pnacl2, for pnacl.

buildbot/buildbot_pnacl1.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 xtrace
 set -o nounset
 set -o errexit
 
+clobber() {
+  echo "@@@BUILD_STEP clobber@@@"
+  rm -rf scons-out toolchain compiler hg ../xcodebuild ../sconsbuild ../out \
+    src/third_party/nacl_sdk/arm-newlib
+}
 
 # This is the first thing you want to run on the bots to install the toolchains
-toolchain-setup() {
-  echo @@@BUILD_STEP clobber@@@
-  rm -rf scons-out toolchain compiler hg ../xcodebuild ../sconsbuild ../out \
-    src/third_party/nacl_sdk/arm-newlib
-
-  echo @@@BUILD_STEP gclient_runhooks@@@
+install-lkgr-toolchains() {
+  echo "@@@BUILD_STEP gclient_runhooks@@@"
   gclient runhooks --force
 }
 
 # We usually do not trust the TC to provide the latest (extra) SDK
 # so we rebuild them here
 partial-sdk() {
-  echo @@@BUILD_STEP partial_sdk@@@
+  echo "@@@BUILD_STEP partial_sdk@@@"
   UTMAN_BUILDBOT=true tools/llvm/utman.sh extrasdk-make-install
 }
 
 # These tars up the executable to be shipped to the arm HW bots
 archive-for-hw-bots() {
-  echo @@@BUILD_STEP archive_build@@@
+  echo "@@@BUILD_STEP archive_build@@@"
   tar cvfz arm.tgz scons-out/
   # TODO(bradnelson): explain this mechanism
   if [[ $BUILDBOT_BUILDERNAME == nacl-* ]]; then
     VERSION=None
   else
     VERSION=rev_${BUILDBOT_GOT_REVISION}
   fi
   /b/build/scripts/slave/gsutil -h Cache-Control:no-cache cp -a public-read \
     arm.tgz gs://nativeclient-archive2/between_builders/\
 ${BUILDBOT_BUILDERNAME}/${VERSION}/build.tgz
@@ skipping 11 matching lines @@
   export CC=${TOOLCHAIN_BIN}/arm-none-linux-gnueabi-gcc
   export CXX=${TOOLCHAIN_BIN}/arm-none-linux-gnueabi-g++
   export LD=${TOOLCHAIN_BIN}/arm-none-linux-gnueabi-ld
   export RANLIB=${TOOLCHAIN_BIN}/arm-none-linux-gnueabi-ranlib
   export SYSROOT
   export GYP_DEFINES="target_arch=arm \
     sysroot=${TOOLCHAIN_DIR}/arm-none-linux-gnueabi/libc \
     linux_use_tcmalloc=0 armv7=1 arm_thumb=1"
   export GYP_GENERATOR=make
 
   echo @@@BUILD_STEP gyp_compile@@@

[jvoung - send to chromium..., 2011/04/19 16:46:14]

Can add quotes here and for gyp_tests also.

   make -C .. -k -j8 V=1 BUILDTYPE=${gypmode}
 
   echo @@@BUILD_STEP gyp_tests@@@
   python trusted_test.py --config ${gypmode}
 }
 
 
 ad-hoc-shared-lib-tests() {
   # TODO(robertm): make this accessible by the utman script so that this get
   # http://code.google.com/p/nativeclient/issues/detail?id=1647
-  echo @@@BUILD_STEP fake_shared_libs@@@
+  echo "@@@BUILD_STEP fake_shared_libs@@@"
   pushd  tests/pnacl_ld_example/
   make -f Makefile.pnacl clean
   make -f Makefile.pnacl preparation
   make -f Makefile.pnacl run.x86-32
   make -f Makefile.pnacl run.arm
   popd
 }
 
 readonly SCONS_COMMON="./scons --verbose bitcode=1 -j8 -k"
 
 single-scons-test() {
   local platform=$1
   local extra=$2
   # this extra is actually printed as part of the build step
   local extra2=$3
   local test=$4
   echo "@@@BUILD_STEP scons [${platform}] [${test}] [${extra2}]@@@"
   ${SCONS_COMMON} ${extra} ${extra2} platform=${platform} ${test} || \
      (RETCODE=$? && echo @@@STEP_FAILURE@@@)

[jvoung - send to chromium..., 2011/04/19 16:46:14]

can add quotes for the @@@ here too

 
 
 }
 
 scons-tests() {
   local platforms=$1
   local extra=$2
   local test=$3
   for platform in ${platforms} ; do
     single-scons-test ${platform} "${extra}" "" "${test}"
     single-scons-test ${platform} "${extra}" "nacl_pic=1" "${test}"
     if [ "${platform}" != "arm" ] ; then
       single-scons-test ${platform} "${extra}" \
         "use_sandboxed_translator=1" "${test}"
     fi
   done
 }
 
 ######################################################################
 mode-trybot() {
-  toolchain-setup
+  clobber
+  install-lkgr-toolchains
   partial-sdk
   scons-tests "arm x86-32 x86-64" "--mode=opt-host,nacl" "smoke_tests"
   ad-hoc-shared-lib-tests
 }
 
-mode-buildbot() {
-  toolchain-setup
+mode-buildbot-x8632() {
+  clobber
+  install-lkgr-toolchains
   partial-sdk
   # First build everything
-  scons-tests "arm x86-32 x86-64" "--mode=opt-host,nacl" ""
+  scons-tests "x86-32" "--mode=opt-host,nacl" ""
   # Then test (not all nexes which are build are also tested)
-  scons-tests "arm x86-32 x86-64" "--mode=opt-host,nacl" "smoke_tests"
+  scons-tests "x86-32" "--mode=opt-host,nacl" "smoke_tests"
+  ad-hoc-shared-lib-tests
+}
+
+mode-buildbot-x8664() {
+  clobber
+  install-lkgr-toolchains
+  partial-sdk
+  # First build everything
+  scons-tests "x86-64" "--mode=opt-host,nacl" ""
+  # Then test (not all nexes which are build are also tested)
+  scons-tests "x86-64" "--mode=opt-host,nacl" "smoke_tests"
   ad-hoc-shared-lib-tests
 }
 
 # NOTE: not tested yet, for reference only to illustrate future plans
 # TOOD(robertm): see whether it really makes sense to merge dbg/opt
 mode-buildbot-arm() {
-  toolchain-setup
+  clobber
+  install-lkgr-toolchains
   partial-sdk
   # gyp tests for both opt and dbg
   gyp-arm-build opt
   gyp-arm-build dbg
   # note we build both opt and dbg trusted components
   scons-tests "arm" "--mode=dbg-host,nacl" ""
   scons-tests "arm" "--mode=opt-host,nacl" ""
   # the testing is done only with opt components
   scons-tests "arm" "--mode=opt-host,nacl" "small_tests"
   scons-tests "arm" "--mode=opt-host,nacl" "medium_tests"
@@ skipping 22 matching lines @@
 fi
 
 if [ "$(type -t $1)" != "function" ]; then
   Usage
   echo "ERROR: unknown mode '$1'." >&2
   exit 1
 fi
 
 eval "$@"