Non-SFI mode: SCONS_NONSFI_TC clean up.

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 30 matching lines @@
     run_stack_alignment_test_irt \
     run_syscall_test_irt"
 # This uses the host-libc-based nonsfi_loader, for which only a subset of
 # the tests works so far.
 # Using skip_nonstable_bitcode=1 here disables the tests for zero-cost C++
 # exception handling, which don't pass for Non-SFI mode yet because we
 # don't build libgcc_eh for Non-SFI mode.
 # TODO(mseaborn): Run small_tests_irt with nonsfi_nacl=1 when it passes,
 # instead of the following whitelist of tests.
 readonly SCONS_NONSFI_TESTS="\
-    run_hello_world_test_irt \
-    run_float_test_irt \
-    run_malloc_realloc_calloc_free_test_irt \
-    run_dup_test_irt \
-    run_syscall_test_irt \
-    run_getpid_test_irt \
-    toolchain_tests_irt \
-    skip_nonstable_bitcode=1 \
-    use_newlib_nonsfi_loader=0"
-readonly SCONS_NONSFI_NEWLIB="nonsfi_nacl=1 ${SCONS_NONSFI_NEWLIB_TESTS}"
-readonly SCONS_NONSFI="nonsfi_nacl=1 ${SCONS_NONSFI_TESTS}"
-# Extra non-IRT-using test to run for x86-32 and ARM on toolchain bots.
-# TODO(mseaborn): Run this on the main bots after the toolchain revision is
-# updated.
-readonly SCONS_NONSFI_TC="\
-    ${SCONS_NONSFI} \
     run_clock_get_test \
     run_dup_test \
     run_fcntl_test \
     run_fork_test \
     run_hello_world_test \
     run_mmap_test \
     run_nanosleep_test \
     run_prctl_test \
     run_printf_test \
     run_pwrite_test \
     run_socket_test \
     run_stack_alignment_test \
-    run_syscall_test"
+    run_syscall_test \
+    run_hello_world_test_irt \
+    run_float_test_irt \
+    run_malloc_realloc_calloc_free_test_irt \
+    run_dup_test_irt \
+    run_syscall_test_irt \
+    run_getpid_test_irt \
+    toolchain_tests_irt \
+    skip_nonstable_bitcode=1 \
+    use_newlib_nonsfi_loader=0"
+readonly SCONS_NONSFI_NEWLIB="nonsfi_nacl=1 ${SCONS_NONSFI_NEWLIB_TESTS}"
+readonly SCONS_NONSFI="nonsfi_nacl=1 ${SCONS_NONSFI_TESTS}"
 
 # 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 DRIVER_TESTS="pnacl/driver/tests/driver_tests.py"
 
@@ skipping 379 matching lines @@
     "${scons_flags} use_sandboxed_translator=1 translate_fast=1" \
     "toolchain_tests"
   # Smaller set of sbtc tests for ARM because qemu is flaky.
   scons-stage-irt "arm" "${scons_flags} use_sandboxed_translator=1" \
     "run_hello_world_test"
   scons-stage-irt "arm" \
     "${scons_flags} use_sandboxed_translator=1 translate_fast=1" \
     "run_hello_world_test"
 
   # Test Non-SFI Mode.
-  scons-stage-irt "x86-32" "${scons_flags}" "${SCONS_NONSFI_TC}"
-  scons-stage-irt "arm" "${scons_flags}" "${SCONS_NONSFI_TC}"
+  scons-stage-irt "x86-32" "${scons_flags}" "${SCONS_NONSFI}"
+  scons-stage-irt "arm" "${scons_flags}" "${SCONS_NONSFI}"
 
   # Test unsandboxed mode.
   scons-stage-irt "x86-32" "${scons_flags}" "pnacl_unsandboxed=1" \
     "run_hello_world_test_irt"
 
   # Run the GCC torture tests just for x86-32.  Testing a single
   # architecture gives good coverage without taking too long.  We
   # don't test x86-64 here because some of the torture tests fail on
   # the x86-64 toolchain trybot (though not the buildbots, apparently
   # due to a hardware difference:
@@ skipping 68 matching lines @@
   exit 1
 fi
 
 "$@"
 
 if [[ ${RETCODE} != 0 ]]; then
   echo "@@@BUILD_STEP summary@@@"
   echo There were failed stages.
   exit ${RETCODE}
 fi