Further deduplicate and simplify PNaCl SCons testing

buildbot/buildbot_pnacl.sh

Index: buildbot/buildbot_pnacl.sh
diff --git a/buildbot/buildbot_pnacl.sh b/buildbot/buildbot_pnacl.sh
index 712661cdf4f9903b27990760f934e42023914826..421b32cde68ae7e6d932a7f0d7bd4d1fe5bd146f 100755
--- a/buildbot/buildbot_pnacl.sh
+++ b/buildbot/buildbot_pnacl.sh
@@ -55,28 +55,21 @@ readonly SCONS_NONSFI_TESTS="\
     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="\

[Mark Seaborn, 2014/07/28 21:12:31]

This overlaps with Hidehiko's change
(https://codereview.chromium.org/415383002/).  Since it's smaller in scope, I'd
rather like to see it committed first...  Plus it has trybot runs ready whereas
this doesn't. :-)

[Derek Schuff, 2014/07/28 21:16:05]

Acknowledged.

-    ${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 \
+    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"
@@ -86,6 +79,7 @@ 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"
+readonly BUILDBOT_PNACL_PY="buildbot/buildbot_pnacl.py"
 
 
 tc-build-translator() {
@@ -383,27 +377,11 @@ mode-buildbot-arm-hw() {
 }
 
 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
+  # TODO(dschuff): move the gyp build to buildbot_pnacl.py
   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_NEWLIB}"
-  scons-stage-irt "arm" "${qemuflags}" "${SCONS_NONSFI}"
+  ${BUILDBOT_PNACL_PY} opt arm pnacl
 }
 
 mode-buildbot-arm-dbg() {
@@ -450,38 +428,12 @@ tc-tests-all() {
   # newlib
   for arch in x86-32 x86-64 arm; do
     driver-tests "${arch}"
-    scons-stage-noirt "$arch" "${scons_flags}" "${SCONS_TC_TESTS}"
-    # Large tests cannot be run in parallel
-    scons-stage-noirt "$arch" "${scons_flags} -j1" "large_tests"
-    scons-stage-noirt "$arch" "${scons_flags} pnacl_generate_pexe=0" \
-        "nonpexe_tests"
   done
 
-  # Small set of sbtc tests w/ and without translate_fast=1.
-  scons-stage-irt "x86-32" "${scons_flags} use_sandboxed_translator=1" \
-    "toolchain_tests"
-  scons-stage-irt "x86-32" \
-    "${scons_flags} use_sandboxed_translator=1 translate_fast=1" \
-    "toolchain_tests"
-  scons-stage-irt "x86-64" "${scons_flags} use_sandboxed_translator=1" \
-    "toolchain_tests"
-  scons-stage-irt "x86-64" \
-    "${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}"
-
-  # Test unsandboxed mode.
-  scons-stage-irt "x86-32" "${scons_flags}" "pnacl_unsandboxed=1" \
-    "run_hello_world_test_irt"
+  # All the SCons tests (the same ones run by the main waterfall bot)
+  for arch in 32 64 arm; do
+    ${BUILDBOT_PNACL_PY} opt "${arch}" pnacl
+  done
 
   # Run the GCC torture tests just for x86-32.  Testing a single
   # architecture gives good coverage without taking too long.  We