[llvm-commits] [test-suite] r95314 - in /test-suite/trunk/External/SPEC: CINT2006/483.xalancbmk/Makefile Makefile.spec

[Bob Wilson]

Author: bwilson
Date: Thu Feb  4 12:08:15 2010
New Revision: 95314

URL: http://llvm.org/viewvc/llvm-project?rev=95314&view=rev
Log:
Add support for running opt-beta tests in the External testsuite.

Modified:
    test-suite/trunk/External/SPEC/CINT2006/483.xalancbmk/Makefile
    test-suite/trunk/External/SPEC/Makefile.spec

Modified: test-suite/trunk/External/SPEC/CINT2006/483.xalancbmk/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2006/483.xalancbmk/Makefile?rev=95314&r1=95313&r2=95314&view=diff

==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/483.xalancbmk/Makefile (original)
+++ test-suite/trunk/External/SPEC/CINT2006/483.xalancbmk/Makefile Thu Feb  4 12:08:15 2010
@@ -34,7 +34,7 @@
 
 ifdef SMALL_PROBLEM_SIZE
 
-Output/483.xalancbmk.out-nat Output/483.xalancbmk.out-llc Output/483.xalancbmk.out-llc-beta: Output/small-test.xml Output/100mb.xsd
+Output/483.xalancbmk.out-nat Output/483.xalancbmk.out-llc Output/483.xalancbmk.out-llc-beta Output/483.xalancbmk.out-opt-beta: Output/small-test.xml Output/100mb.xsd
 
 Output/small-test.xml: $(SPEC_BENCH_DIR)/data/test/input/test.xml
 	$(VERB) sed -E -e 's/([a-z]+ ){5}//g' $< > $@

Modified: test-suite/trunk/External/SPEC/Makefile.spec
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/Makefile.spec?rev=95314&r1=95313&r2=95314&view=diff

==============================================================================
--- test-suite/trunk/External/SPEC/Makefile.spec (original)
+++ test-suite/trunk/External/SPEC/Makefile.spec Thu Feb  4 12:08:15 2010
@@ -79,6 +79,15 @@
 	  $(SPEC_OUTPUT_FILE_FILTER) > $@
 	-cp Output/llc-beta-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
 
+$(PROGRAMS_TO_TEST:%=Output/%.out-opt-beta): \
+Output/%.out-opt-beta: Output/%.opt-beta
+	$(SPEC_SANDBOX) opt-beta-$(RUN_TYPE) $@ $(REF_IN_DIR) \
+             $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
+                  ../$*.opt-beta $(RUN_OPTIONS)
+	-(cd Output/opt-beta-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) | \
+	  $(SPEC_OUTPUT_FILE_FILTER) > $@
+	-cp Output/opt-beta-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
+
 $(PROGRAMS_TO_TEST:%=Output/%.out-cbe): \
 Output/%.out-cbe: Output/%.cbe
 	$(SPEC_SANDBOX) cbe-$(RUN_TYPE) $@ $(REF_IN_DIR) \