Change built_elsewhere flag to work with pexe mode

buildbot/buildbot_pnacl.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.
 
 set -o xtrace
 set -o nounset
 set -o errexit
 
 # If true, terminate script when first scons error is encountered.
@@ skipping 65 matching lines @@
 }
 
 # Tar up the executables which are shipped to the arm HW bots
 archive-for-hw-bots() {
   local name=$1
   local try=$2
 
   echo "@@@BUILD_STEP tar_generated_binaries@@@"
   # clean out a bunch of files that are not needed
   find scons-out/ \
-    \( -name '*.[so]' -o -name '*.bc' -o -name '*.pexe' -o -name '*.ll' \) \
+    \( -name '*.o' -o -name '*.bc' \) \
     -print0 | xargs -0 rm -f
 
-  tar cvfz arm-tcb.tgz scons-out/
+  # delete nexes from pexe mode directories to force translation
+  # TODO(dschuff) enable this once we can translate on the hw bots
+  #find scons-out/*pexe*/ -name '*.nexe' -print0 | xargs -0 rm -f
+  tar cvfz arm-scons.tgz scons-out/*arm*
 
   echo "@@@BUILD_STEP archive_binaries@@@"
   if [[ ${try} == "try" ]] ; then
-    ${UP_DOWN_LOAD} UploadArmBinariesForHWBotsTry ${name} arm-tcb.tgz
+    ${UP_DOWN_LOAD} UploadArmBinariesForHWBotsTry ${name} arm-scons.tgz
   else
-    ${UP_DOWN_LOAD} UploadArmBinariesForHWBots ${name} arm-tcb.tgz
+    ${UP_DOWN_LOAD} UploadArmBinariesForHWBots ${name} arm-scons.tgz
   fi
 }
 
 # Untar archived executables for HW bots
 unarchive-for-hw-bots() {
   local name=$1
   local try=$2
 
   echo "@@@BUILD_STEP fetch_binaries@@@"
   if [[ ${try} == "try" ]] ; then
-    ${UP_DOWN_LOAD} DownloadArmBinariesForHWBotsTry ${name} arm-tcb.tgz
+    ${UP_DOWN_LOAD} DownloadArmBinariesForHWBotsTry ${name} arm-scons.tgz
   else
-    ${UP_DOWN_LOAD} DownloadArmBinariesForHWBots ${name} arm-tcb.tgz
+    ${UP_DOWN_LOAD} DownloadArmBinariesForHWBots ${name} arm-scons.tgz
   fi
 
   echo "@@@BUILD_STEP untar_binaries@@@"
   rm -rf scons-out/
-  tar xvfz arm-tcb.tgz --no-same-owner
+  tar xvfz arm-scons.tgz --no-same-owner
 }
 
 # Build with gyp - this only exercises the trusted TC and hence this only
 # makes sense to run for ARM.
 gyp-arm-build() {
   gypmode=$1
   TOOLCHAIN_DIR=native_client/toolchain/linux_arm-trusted
   EXTRA="-isystem ${TOOLCHAIN_DIR}/usr/include \
          -Wl,-rpath-link=${TOOLCHAIN_DIR}/lib/arm-linux-gnueabi \
          -L${TOOLCHAIN_DIR}/lib \
@@ skipping 231 matching lines @@
 
   clobber
   install-lkgr-toolchains
 
   gyp-arm-build Release
 
   scons-tests "arm" "${mode} -j8 -k" ""
   # Run all 3 test suites in a single scons invocation to minimize
   # processing time of *.scons files
   scons-tests "arm" "${mode} -k" "small_tests medium_tests large_tests"
+
+  # Run tests in pexe mode
+  scons-tests-no-translator "arm" "${mode} -k pnacl_generate_pexe=1" \
+    "toolchain_tests"
+
   # Full test suite of translator for ARM is too flaky on QEMU
   # http://code.google.com/p/nativeclient/issues/detail?id=2581
   # Running a subset here (and skipping in scons-test() itself).
   scons-tests-translator "arm" "--mode=opt-host,nacl -j4 -k" "toolchain_tests"
   browser-tests "arm" "${mode}"
   ad-hoc-shared-lib-tests "arm"
 }
 
 mode-buildbot-arm-dbg() {
   mode-buildbot-arm "--mode=dbg-host,nacl"
   archive-for-hw-bots $(NAME_ARM_UPLOAD) regular
 }
 
 mode-buildbot-arm-opt() {
   mode-buildbot-arm "--mode=opt-host,nacl"
   archive-for-hw-bots $(NAME_ARM_UPLOAD) regular
 }
 
 mode-buildbot-arm-try() {
   mode-buildbot-arm "--mode=opt-host,nacl"
   archive-for-hw-bots $(NAME_ARM_TRY_UPLOAD) try
 }
 
 mode-buildbot-arm-hw() {
   FAIL_FAST=false
   local flags="naclsdk_validate=0 built_elsewhere=1 $1"
   scons-tests-no-translator "arm" "${flags} -k" \
      "small_tests medium_tests large_tests"
+  scons-tests-no-translator "arm" "${flags} -k pnacl_generate_pexe=1" \
+    "toolchain_tests"
   browser-tests "arm" "${flags}"
 }
 
 # NOTE: the hw bots are too slow to build stuff on so we just
 #       use pre-built executables
 mode-buildbot-arm-hw-dbg() {
   unarchive-for-hw-bots $(NAME_ARM_DOWNLOAD)  regular
   mode-buildbot-arm-hw "--mode=dbg-host,nacl"
 }
 
@@ skipping 65 matching lines @@
   exit 1
 fi
 
 "$@"
 
 if [[ ${RETCODE} != 0 ]]; then
   echo "@@@BUILD_STEP summary@@@"
   echo There were failed stages.
   exit ${RETCODE}
 fi