[llvm-commits] [test-suite] r109885 - in /test-suite/trunk/External/SPEC: CINT95/147.vortex/Makefile Makefile.spec

Fri Jul 30 13:23:48 PDT 2010

Author: stoklund
Date: Fri Jul 30 15:23:48 2010
New Revision: 109885

URL: http://llvm.org/viewvc/llvm-project?rev=109885&view=rev
Log:
Fix stdout race for 147.vortex.

This test insists on writing its output to a file, so we need to concatenate it
with the exit code that RunSafely.sh appended to STDOUT_FILENAME.

Modified:
    test-suite/trunk/External/SPEC/CINT95/147.vortex/Makefile
    test-suite/trunk/External/SPEC/Makefile.spec

Modified: test-suite/trunk/External/SPEC/CINT95/147.vortex/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT95/147.vortex/Makefile?rev=109885&r1=109884&r2=109885&view=diff
==============================================================================

--- test-suite/trunk/External/SPEC/CINT95/147.vortex/Makefile (original)
+++ test-suite/trunk/External/SPEC/CINT95/147.vortex/Makefile Fri Jul 30 15:23:48 2010
@@ -2,12 +2,15 @@
 
 #include $(LEVEL)/Makefile.config
 
-STDOUT_FILENAME := vortex.out
 LDFLAGS += -lm
 LIBS    += -lm
 
 include ../../Makefile.spec95
 
+# The executable writes virtex.out, and RunSafely.sh appends the exit code to
+# $(STDOUT_FILENAME). We need both.
+LOCAL_OUTPUTS := vortex.out $(STDOUT_FILENAME)
+
 ifeq ($(ARCH),Sparc)
   ## SPEC portability note for vortex says to use this flag on 64-bit machines
   CPPFLAGS += -D__RISC_64__

Modified: test-suite/trunk/External/SPEC/Makefile.spec
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/Makefile.spec?rev=109885&r1=109884&r2=109885&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/Makefile.spec (original)
+++ test-suite/trunk/External/SPEC/Makefile.spec Fri Jul 30 15:23:48 2010
@@ -13,7 +13,7 @@
 # Information about testing the program...
 REF_IN_DIR  := $(SPEC_BENCH_DIR)/data/$(RUN_TYPE)/input/
 REF_OUT_DIR := $(SPEC_BENCH_DIR)/data/$(RUN_TYPE)/output/
-LOCAL_OUTPUTS := $(notdir $(wildcard $(REF_OUT_DIR)/*))
+LOCAL_OUTPUTS = $(notdir $(wildcard $(REF_OUT_DIR)/*))
 
 # Sometimes a test will output its program name or some other gunk that
 # we don't want to diff against. Tests can override this definition to



