[llvm-commits] [test-suite] r65875 - /test-suite/trunk/External/SPEC/CFP2006/447.dealII/Makefile

[Dan Gohman]

Author: djg
Date: Mon Mar  2 15:33:58 2009
New Revision: 65875

URL: http://llvm.org/viewvc/llvm-project?rev=65875&view=rev
Log:
Tests like 'ifeq ($(RUN_TYPE),test' must be done after including
Makefile.spec2006, which sets RUN_TYPE. Also, don't duplicate
Makefile.spec2006's setting of RUN_TYPE.

Modified:
    test-suite/trunk/External/SPEC/CFP2006/447.dealII/Makefile

Modified: test-suite/trunk/External/SPEC/CFP2006/447.dealII/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CFP2006/447.dealII/Makefile?rev=65875&r1=65874&r2=65875&view=diff

==============================================================================
--- test-suite/trunk/External/SPEC/CFP2006/447.dealII/Makefile (original)
+++ test-suite/trunk/External/SPEC/CFP2006/447.dealII/Makefile Mon Mar  2 15:33:58 2009
@@ -13,27 +13,15 @@
         -DBOOST_DISABLE_THREADS   \
         -I$(SPEC_BENCH_DIR)/src/include
 
-ifndef RUN_TYPE
-ifdef SMALL_PROBLEM_SIZE
-RUN_TYPE=test
-else
-ifdef LARGE_PROBLEM_SIZE
-RUN_TYPE=ref
-else
-RUN_TYPE=train
-endif
-endif
-endif
-
-ifeq ($(RUN_TYPE),test)
-  RUN_OPTIONS := 8
-else
-  RUN_OPTIONS := 10
-endif
-
 STDOUT_FILENAME := log
 
 LDFLAGS = -lstdc++ -lm
 LIBS    = -lm
 
 include ../../Makefile.spec2006
+
+ifeq ($(RUN_TYPE),test)
+  RUN_OPTIONS = 8
+else
+  RUN_OPTIONS = 10
+endif