[llvm-commits] [test-suite] r103404 - in /test-suite/trunk: Makefile.programs MultiSource/Benchmarks/Olden/treeadd/Makefile MultiSource/Benchmarks/Olden/treeadd/reference-output.normal MultiSource/Benchmarks/Olden/treeadd/reference-output.small

[Daniel Dunbar]

Author: ddunbar
Date: Mon May 10 10:29:00 2010
New Revision: 103404

URL: http://llvm.org/viewvc/llvm-project?rev=103404&view=rev
Log:
Revert "add the ability for a makefile to specify a custom reference output," it broke in places.

Removed:
    test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/reference-output.normal
    test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/reference-output.small
Modified:
    test-suite/trunk/Makefile.programs
    test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/Makefile

Modified: test-suite/trunk/Makefile.programs
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.programs?rev=103404&r1=103403&r2=103404&view=diff
==============================================================================
--- test-suite/trunk/Makefile.programs (original)
+++ test-suite/trunk/Makefile.programs Mon May 10 10:29:00 2010
@@ -73,12 +73,6 @@
   RUNTIMELIMIT := 500
 endif
 
-# If the program specified a REFERENCE_OUTPUT_FILE, they obviously want to
-# USE_REFERENCE_OUTPUT.
-ifdef REFERENCE_OUTPUT_FILE
-USE_REFERENCE_OUTPUT := 1
-endif
-
 # RUNSAFELY - This program simply runs another program.  If the program works
 # correctly, this script has no effect, otherwise it will do things like print a
 # stack trace of a core dump.  It always returns "successful" so that tests will
@@ -764,17 +758,10 @@
 	cp $< $@
 else 
 ifdef USE_REFERENCE_OUTPUT
-
-# If the app wants to USE_REFERENCE_OUTPUT, but hasn't specified a file
-# containing the reference output, default to programname.reference_output.
-ifndef REFERENCE_OUTPUT_FILE
-REFERENCE_OUTPUT_FILE = $(PROJ_SRC_DIR)/%.reference_output
-endif
-
 # In this case, we opt out of generating the native output and just
 # copy it from a reference output
 $(PROGRAMS_TO_TEST:%=Output/%.out-nat): \
-Output/%.out-nat: $(REFERENCE_OUTPUT_FILE) Output/.dir
+Output/%.out-nat: $(PROJ_SRC_DIR)/%.reference_output Output/.dir
 	cp $< $@
 endif
 endif

Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/Makefile?rev=103404&r1=103403&r2=103404&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/Makefile Mon May 10 10:29:00 2010
@@ -6,10 +6,8 @@
 
 ifdef SMALL_PROBLEM_SIZE
 RUN_OPTIONS = 20
-REFERENCE_OUTPUT_FILE = $(PROJ_SRC_DIR)/reference-output.small
 else
 RUN_OPTIONS = 22
-REFERENCE_OUTPUT_FILE = $(PROJ_SRC_DIR)/reference-output.normal
 endif
 
 include $(LEVEL)/MultiSource/Makefile.multisrc

Removed: test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/reference-output.normal
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/reference-output.normal?rev=103403&view=auto
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/reference-output.normal (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/reference-output.normal (removed)
@@ -1,5 +0,0 @@
-Treeadd with 22 levels on 4 processors 
-About to enter TreeAlloc
-About to enter TreeAdd
-Received result of 4194303
-exit 0

Removed: test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/reference-output.small
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/reference-output.small?rev=103403&view=auto
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/reference-output.small (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/reference-output.small (removed)
@@ -1,5 +0,0 @@
-Treeadd with 20 levels on 4 processors 
-About to enter TreeAlloc
-About to enter TreeAdd
-Received result of 1048575
-exit 0