[llvm-commits] [test-suite] r91369 - in /test-suite/trunk/External: Makefile SPEC/CFP2006/Makefile SPEC/CINT2000/Makefile SPEC/CINT2006/Makefile

[Daniel Dunbar]

Author: ddunbar
Date: Mon Dec 14 18:02:42 2009
New Revision: 91369

URL: http://llvm.org/viewvc/llvm-project?rev=91369&view=rev
Log:
NightlyTest: Implement DISABLE_CXX for externals.

Modified:
    test-suite/trunk/External/Makefile   (contents, props changed)
    test-suite/trunk/External/SPEC/CFP2006/Makefile   (contents, props changed)
    test-suite/trunk/External/SPEC/CINT2000/Makefile   (contents, props changed)
    test-suite/trunk/External/SPEC/CINT2006/Makefile   (contents, props changed)

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

==============================================================================
--- test-suite/trunk/External/Makefile (original)
+++ test-suite/trunk/External/Makefile Mon Dec 14 18:02:42 2009
@@ -39,4 +39,8 @@
 PARALLEL_DIRS := $(filter-out Namd, $(PARALLEL_DIRS))
 endif
 
+ifdef DISABLE_CXX
+PARALLEL_DIRS := $(filter-out Nurbs, $(PARALLEL_DIRS))
+endif
+
 include Makefile.external

Propchange: test-suite/trunk/External/Makefile

------------------------------------------------------------------------------
    svn:executable = *

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

==============================================================================
--- test-suite/trunk/External/SPEC/CFP2006/Makefile (original)
+++ test-suite/trunk/External/SPEC/CFP2006/Makefile Mon Dec 14 18:02:42 2009
@@ -50,6 +50,12 @@
 #   465.tonto     - infinite loop, works at -O0, not at -O2
 #   482.sphinx3   - generates control file at run time
 
+ifdef DISABLE_CXX
+PARALLEL_DIRS := $(filter-out 444.namd, $(PARALLEL_DIRS))
+PARALLEL_DIRS := $(filter-out 447.dealII, $(PARALLEL_DIRS))
+PARALLEL_DIRS := $(filter-out 450.soplex, $(PARALLEL_DIRS))
+endif
+
 # Get the $(ARCH) setting
 include $(LEVEL)/Makefile.config
 

Propchange: test-suite/trunk/External/SPEC/CFP2006/Makefile

------------------------------------------------------------------------------
    svn:executable = *

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

==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/Makefile (original)
+++ test-suite/trunk/External/SPEC/CINT2000/Makefile Mon Dec 14 18:02:42 2009
@@ -26,4 +26,8 @@
 
 endif
 
+ifdef DISABLE_CXX
+PARALLEL_DIRS := $(filter-out 252.eon, $(PARALLEL_DIRS))
+endif
+
 include $(LEVEL)/Makefile.programs

Propchange: test-suite/trunk/External/SPEC/CINT2000/Makefile

------------------------------------------------------------------------------
    svn:executable = *

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

==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/Makefile (original)
+++ test-suite/trunk/External/SPEC/CINT2006/Makefile Mon Dec 14 18:02:42 2009
@@ -24,6 +24,11 @@
         473.astar
 endif
 
+ifdef DISABLE_CXX
+PARALLEL_DIRS := $(filter-out 471.omnetpp, $(PARALLEL_DIRS))
+PARALLEL_DIRS := $(filter-out 483.xalancbmk, $(PARALLEL_DIRS))
+endif
+
 # Get the $(ARCH) setting
 include $(LEVEL)/Makefile.config
 

Propchange: test-suite/trunk/External/SPEC/CINT2006/Makefile

------------------------------------------------------------------------------
    svn:executable = *