Subzero: Fix a cleanup error after the IceString removal CL.

Makefile.standalone

 # The following variables will likely need to be modified, depending on where
 # and how you built LLVM & Clang. They can be overridden in a command-line
 # invocation of make, like:
 #
 #   make LLVM_SRC_PATH=<path> LIBCXX_INSTALL_PATH=<path> CLANG_PATH=<path> \
 #        PNACL_BIN_PATH=<path> ...
 #
 
 # LLVM_SRC_PATH is the path to the root of the checked out source code. This
 # directory should contain the configure script, the include/ and lib/
@@ skipping 552 matching lines @@
   TARGETFLAG=x8664
   SETUP=SetupGccX8664Opt
   SPEC := --filetype=obj
 endif
 ifeq ($(TARGET),arm32)
   TARGETFLAG=arm32
   SETUP=SetupGccArmOpt
   SPEC := --filetype=obj
 endif
 SPECFLAGS := -O2
-SPECBUILDONLY := false
+SPECRUN := --run
 %.spec2k: % $(OBJDIR)/pnacl-sz make_symlink runtime
         ./pydir/szbuild_spec2k.py -v \
-          $(SPECFLAGS) --target=$(TARGETFLAG) $(SPEC) $<
-        $(SPECBUILDONLY) || ( cd ../../../tests/spec2k; \
-         ./run_all.sh RunTimedBenchmarks $(SETUP) train $< )
+          $(SPECFLAGS) --target=$(TARGETFLAG) $(SPEC) $< $(SPECRUN)
 
 check-spec: exists-spec $(ALLSPEC:=.spec2k)
 
 check: check-lit check-unit check-xtest
 
 NONSFI_LOADER_X8632 = \
   $(NACL_ROOT)/scons-out/opt-linux-x86-32/obj/src/nonsfi/loader/nonsfi_loader
 NONSFI_LOADER_ARM32 = \
   $(NACL_ROOT)/scons-out/opt-linux-arm/obj/src/nonsfi/loader/nonsfi_loader
 SBTC_LIBFILE = $(SB_LLVM_PATH)/lib/libLLVMSupport.a
@@ skipping 43 matching lines @@
           GPLUSPLUS=1 compile_only
 # Check the x86 assembler unit tests.
         +make -f Makefile.standalone \
           DEBUG=1 CHECK_X86_ASM=1 check-unit sb
 # Run lit tests, cross tests, unit tests, and spec2k/x86-32.
         +make -f Makefile.standalone \
           check check-spec
 # Run spec2k/x86-64.
         +make -f Makefile.standalone \
           TARGET=x8664 check-spec
+# Run spec2k/x86-64 with sandboxing.
+        +make -f Makefile.standalone \
+          SPECFLAGS='-O2 --sandbox' TARGET=x8664 check-spec
 # Build spec2k under -Om1/x86-32, to check for liveness errors.
         +make -f Makefile.standalone \
-          SPECFLAGS='-Om1' SPECBUILDONLY=true check-spec
+          SPECFLAGS='-Om1' SPECRUN= check-spec
 # Build spec2k under -Om1/x86-64, to check for liveness errors.
         +make -f Makefile.standalone \
-          SPECFLAGS='-Om1' TARGET=x8664 SPECBUILDONLY=true check-spec
+          SPECFLAGS='-Om1' TARGET=x8664 SPECRUN= check-spec
 # Run spec2k for x86-32 without advanced phi lowering.
         +make -f Makefile.standalone \
           SPECFLAGS='-O2 --sz=--phi-edge-split=0' check-spec
 # Run spec2k for x86-64 without advanced phi lowering.
         +make -f Makefile.standalone \
           SPECFLAGS='-O2 --sz=--phi-edge-split=0' TARGET=x8664 check-spec
 # Run cross tests and lit tests to validate filetype=asm output.
         +make -f Makefile.standalone \
           FORCEASM=1 check-xtest check-lit
 # Build spec2k for arm32.
         +make -f Makefile.standalone \
-          TARGET=arm32 SPECBUILDONLY=true check-spec
+          TARGET=arm32 SPECRUN= check-spec
 # Build spec2k under -Om1/arm32.
         +make -f Makefile.standalone \
-          TARGET=arm32 SPECFLAGS='-Om1' SPECBUILDONLY=true check-spec
+          TARGET=arm32 SPECFLAGS='-Om1' SPECRUN= check-spec
 # Run a few spec2k tests for arm32 using qemu. Keep the list sorted in
 # roughly reverse order of runtime.
         +make -f Makefile.standalone \
           TARGET=arm32 ALLSPEC='252.eon 254.gap 176.gcc 181.mcf' check-spec
 # Provide validation of user awesomeness!
         echo Success
 
 presubmit-lite: exists-nonsfi-x8632 exists-nonsfi-arm32 \
   exists-sbtc exists-spec
 # Make sure clang-format gets run.
         +make -f Makefile.standalone format
 # Verify MINIMAL build, plus proper usage of REQUIRES in lit tests.
         +make -f Makefile.standalone \
           MINIMAL=1 check sb-lite
 # Check that there are no g++ build errors or warnings.
         +make -f Makefile.standalone \
           GPLUSPLUS=1 compile_only
 # Run lit tests, cross tests, unit tests, and spec2k/x86-32.
         +make -f Makefile.standalone \
           check-lit check-unit check-spec
         +make -f Makefile.standalone \
           check-xtest-lite
 # Run spec2k/x86-64.
         +make -f Makefile.standalone \
           TARGET=x8664 check-spec
 # Build spec2k under -Om1/x86-32, to check for liveness errors.
         +make -f Makefile.standalone \
-          SPECFLAGS='-Om1' SPECBUILDONLY=true check-spec
+          SPECFLAGS='-Om1' SPECRUN= check-spec
 # Build spec2k under -Om1/x86-64, to check for liveness errors.
         +make -f Makefile.standalone \
-          SPECFLAGS='-Om1' TARGET=x8664 SPECBUILDONLY=true check-spec
+          SPECFLAGS='-Om1' TARGET=x8664 SPECRUN= check-spec
 # Run cross tests and lit tests to validate filetype=asm output.
         +make -f Makefile.standalone \
           FORCEASM=1 check-lit
         +make -f Makefile.standalone \
           FORCEASM=1 check-xtest-lite
 # Build spec2k under -Om1/arm32.
         +make -f Makefile.standalone \
-          TARGET=arm32 SPECFLAGS='-Om1' SPECBUILDONLY=true check-spec
+          TARGET=arm32 SPECFLAGS='-Om1' SPECRUN= check-spec
 # Run a few spec2k tests for arm32 using qemu. Keep the list sorted in
 # roughly reverse order of runtime.
         +make -f Makefile.standalone \
           TARGET=arm32 ALLSPEC='254.gap 176.gcc 181.mcf' check-spec
 # Provide validation of user awesomeness!
         echo Success
 
 FORMAT_BLACKLIST =
 # Add one of the following lines for each source file to ignore.
 FORMAT_BLACKLIST += ! -name IceParseInstsTest.cpp
@@ skipping 32 matching lines @@
 
 help-check-xtest:
         @cat Makefile.standalone-help/check-xtest.txt
 
 clean:
         rm -rf pnacl-sz *.o $(foreach nexe,$(NEXES),$(notdir $(nexe))) \
           $(OBJDIR) $(SB_OBJDIR) $(SBB_OBJDIR) build/*.bloat.json
 
 clean-all: clean
         rm -rf build/ crosstest/Output/