Non-SFI Mode: Add nonsfi_loader and plumbing to test it

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
 
 # Tell build.sh and test.sh that we're a bot.
@@ skipping 11 matching lines @@
 # This remembers when any build steps failed, but we ended up continuing.
 RETCODE=0
 # For scons builds an empty target indicates all targets should be built.
 # This does not run any tests, though.
 # Large tests are not included in this group because they cannot be run
 # in parallel (they can do things like bind to local TCP ports). Large
 # tests are run separately in the functions below.
 readonly SCONS_EVERYTHING=""
 readonly SCONS_S_M="small_tests medium_tests"
 readonly SCONS_S_M_IRT="small_tests_irt medium_tests_irt"
+# TODO(mseaborn): Enable more tests for Non-SFI Mode when they pass.
+readonly SCONS_NONSFI="nonsfi_nacl=1 run_hello_world_test_irt"
 # subset of tests used on toolchain builders
 readonly SCONS_TC_TESTS="small_tests medium_tests"
 
 readonly SCONS_COMMON="./scons --verbose bitcode=1"
 readonly UP_DOWN_LOAD="buildbot/file_up_down_load.sh"
 # This script is used by toolchain bots (i.e. tc-xxx functions)
 readonly PNACL_BUILD="pnacl/build.sh"
 readonly LLVM_TEST="pnacl/scripts/llvm-test.py"
 readonly DRIVER_TESTS="pnacl/driver/tests/driver_tests.py"
 readonly ACCEPTABLE_TOOLCHAIN_SIZE_MB=80
@@ skipping 377 matching lines @@
 
   build-sbtc-prerequisites "arm"
 
   scons-stage-irt "arm" \
     "${qemuflags} use_sandboxed_translator=1 translate_in_build_step=0" \
     "toolchain_tests"
   scons-stage-irt "arm" \
     "${qemuflags} use_sandboxed_translator=1 translate_fast=1 \
        translate_in_build_step=0" \
     "toolchain_tests"
+
+  # Test Non-SFI Mode.
+  scons-stage-irt "arm" "${qemuflags}" "${SCONS_NONSFI}"
 }
 
 mode-buildbot-arm-hw() {
   FAIL_FAST=false
   local hwflags="-j2 -k naclsdk_validate=0 built_elsewhere=1"
 
   scons-stage-noirt "arm" "${hwflags}" "${SCONS_S_M}"
   # Large tests cannot be run in parallel
   scons-stage-noirt "arm" "${hwflags} -j1" "large_tests"
 
   # also run some tests with the irt
   scons-stage-irt "arm" "${hwflags}" "${SCONS_S_M_IRT}"
 
   scons-stage-noirt "arm" "${hwflags} pnacl_generate_pexe=0" "nonpexe_tests"
   scons-stage-irt "arm" \
     "${hwflags} use_sandboxed_translator=1 translate_in_build_step=0" \
     "toolchain_tests"
   scons-stage-irt "arm" \
     "${hwflags} use_sandboxed_translator=1 translate_fast=1 \
        translate_in_build_step=0" \
     "toolchain_tests"
+
+  # Test Non-SFI Mode.
+  scons-stage-irt "arm" "${hwflags}" "${SCONS_NONSFI}"
 }
 
 mode-trybot-qemu() {
   # Build and actually run the arm tests under qemu, except
   # sandboxed translation. Hopefully that's a good tradeoff between
   # flakiness and cycle time.
   FAIL_FAST=false
   local qemuflags="-j4 -k"
   clobber
   gyp-arm-build
 
   scons-stage-noirt "arm" "${qemuflags}" "${SCONS_EVERYTHING}"
   # Large tests cannot be run in parallel
   scons-stage-noirt "arm" "${qemuflags} -j1" "${SCONS_S_M} large_tests"
 
   # also run some tests with the irt
   scons-stage-irt "arm" "${qemuflags}" "${SCONS_S_M_IRT}"
 
   # non-pexe tests
   scons-stage-noirt "arm" "${qemuflags} pnacl_generate_pexe=0" "nonpexe_tests"
+
+  # Test Non-SFI Mode.
+  scons-stage-irt "arm" "${qemuflags}" "${SCONS_NONSFI}"
 }
 
 mode-buildbot-arm-dbg() {
   BUILD_MODE_HOST=DEDUG
   mode-buildbot-arm
   archive-for-hw-bots $(NAME_ARM_UPLOAD) regular
 }
 
 mode-buildbot-arm-opt() {
   mode-buildbot-arm
@@ skipping 102 matching lines @@
 
 test-nonsfi-mode() {
   echo "@@@BUILD_STEP test translating for nonsfi mode@@@"
   # Test that translation produces an executable without giving an
   # error.  We can't run the resulting Non-SFI Mode nexe yet because
   # there is no standalone loader for such nexes that is available in
   # the NaCl build.
   # TODO(mseaborn): Move some of Chromium's
   # components/nacl/loader/nonsfi/ to the NaCl repo so that we can
   # test this here.
   local out_dir=scons-out/nacl_irt_test-x86-32-pnacl-pexe-clang

[jvoung (off chromium), 2014/05/02 19:35:40]

Should this use the new scons mode? (when running on the toolchain builder bots
vs the main waterfall)

[Mark Seaborn, 2014/05/02 19:42:37]

Yes, but I was going to update this in a follow-on change because it's more
fiddly: it involves deciding whether to run this on the x86-32 bot or x86-64 bot
or both.

   local pexe_path=${out_dir}/obj/tests/hello_world/hello_world.final.pexe
   ./scons -j8 bitcode=1 --mode=nacl,nacl_irt_test ${pexe_path}
   for arch in x86-32 arm; do
     toolchain/linux_x86/pnacl_newlib/bin/pnacl-translate -arch ${arch}-nonsfi \
         ${pexe_path} -o /tmp/hellow.nexe
     rm /tmp/hellow.nexe
   done
 }
 
 mode-buildbot-tc-x8632-linux() {
@@ skipping 143 matching lines @@
   exit 1
 fi
 
 "$@"
 
 if [[ ${RETCODE} != 0 ]]; then
   echo "@@@BUILD_STEP summary@@@"
   echo There were failed stages.
   exit ${RETCODE}
 fi