Enable some sandboxed translation tests

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 194 matching lines @@
   # the GlibC scons tests already test PIC mode for X86.
   # BUG= http://code.google.com/p/nativeclient/issues/detail?id=1081
   if [ "${platform}" == arm ]; then
     single-scons-test ${platform} "${extra} nacl_pic=1" "${test}"
   fi
 
   # Full test suite of translator for ARM is too flaky on QEMU
   # http://code.google.com/p/nativeclient/issues/detail?id=2581
   # run only a subset below
   if [ "${platform}" != arm ]; then
+    build-sbtc-prerequisites ${platform}
     scons-tests-translator ${platform} "${extra}" "${test}"
   fi
 }
 
 scons-tests-translator() {
   local platform=$1
   local extra=$2
   local test=$3
 
-  build-sbtc-prerequisites ${platform}
   single-scons-test ${platform} "${extra} use_sandboxed_translator=1" "${test}"
 }
 
 scons-tests-no-translator() {
   local platform=$1
   local extra=$2
   local test=$3
   single-scons-test ${platform} "${extra}" "${test}"
   single-scons-test ${platform} "${extra} nacl_pic=1" "${test}"
 }
@@ skipping 48 matching lines @@
 # NOTE: these trybots are expected to diverge some more hence the code
 #       duplication
 mode-trybot-arm() {
   FAIL_FAST=false
   clobber
   install-lkgr-toolchains
   scons-tests "arm" "--mode=opt-host,nacl -j8 -k" "smoke_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"

[jvoung - send to chromium..., 2012/03/26 23:21:15]

Should this build pre-reqs first too?

[Derek Schuff, 2012/03/26 23:30:19]

Yeah i guess so. this is the bot i'm about to refactor away, but might as well
have it work for now ;)
On 2012/03/26 23:21:15, jvoung wrote:

   browser-tests "arm" "--mode=opt-host,nacl -k"
   ad-hoc-shared-lib-tests "arm"
 }
 
 mode-trybot-x8632() {
   FAIL_FAST=false
   clobber
   install-lkgr-toolchains
   scons-tests "x86-32" "--mode=opt-host,nacl -j8 -k" "smoke_tests"
   browser-tests "x86-32" "--mode=opt-host,nacl -k"
@@ skipping 55 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"
 
+  build-sbtc-prerequisites "arm"
+
   # Run tests in pexe mode
-  scons-tests-no-translator "arm" "${mode} -k pnacl_generate_pexe=1" \
+  scons-tests-no-translator "arm" "${mode} -j4 -k pnacl_generate_pexe=1" \
     "toolchain_tests"
+  scons-tests-translator "arm" \
+    "${mode} -j4 -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"
+  scons-tests-translator "arm" "${mode} -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" \
+  scons-tests-no-translator "arm" "${flags} -k -j2" \
      "small_tests medium_tests large_tests"
-  scons-tests-no-translator "arm" "${flags} -k pnacl_generate_pexe=1" \
+  scons-tests-translator "arm" "${flags} -k -j2 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 66 matching lines @@
   exit 1
 fi
 
 "$@"
 
 if [[ ${RETCODE} != 0 ]]; then
   echo "@@@BUILD_STEP summary@@@"
   echo There were failed stages.
   exit ${RETCODE}
 fi