[llvm-commits] [test-suite] r81047 - in /test-suite/trunk: MultiSource/Applications/Makefile MultiSource/Benchmarks/Makefile SingleSource/Makefile.singlesrc

[Daniel Dunbar]

Author: ddunbar
Date: Fri Sep  4 17:13:52 2009
New Revision: 81047

URL: http://llvm.org/viewvc/llvm-project?rev=81047&view=rev
Log:
Add DISABLE_CXX make variable for nightly test, which skips any tests / programs
which require C++.

Modified:
    test-suite/trunk/MultiSource/Applications/Makefile
    test-suite/trunk/MultiSource/Benchmarks/Makefile
    test-suite/trunk/SingleSource/Makefile.singlesrc

Modified: test-suite/trunk/MultiSource/Applications/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/Makefile?rev=81047&r1=81046&r2=81047&view=diff

==============================================================================
--- test-suite/trunk/MultiSource/Applications/Makefile (original)
+++ test-suite/trunk/MultiSource/Applications/Makefile Fri Sep  4 17:13:52 2009
@@ -4,8 +4,11 @@
 
 include $(LEVEL)/Makefile.config
 
-PARALLEL_DIRS  = Burg aha sgefa siod lambda-0.1.3 d spiff hbd treecc SPASS \
-                 hexxagon oggenc JM viterbi minisat SIBsim4 ClamAV sqlite3 lemon
+PARALLEL_DIRS  = Burg aha sgefa siod d spiff treecc SPASS \
+                 oggenc JM viterbi SIBsim4 ClamAV sqlite3 lemon
+ifndef DISABLE_CXX
+PARALLEL_DIRS += lambda-0.1.3 hbd hexxagon minisat 
+endif
 
 ifndef SMALL_PROBLEM_SIZE
 PARALLEL_DIRS += lua
@@ -18,8 +21,10 @@
 
 # kimwitu++ uses multi-byte chars, not available on sparc/solaris
 ifneq ($(TARGET_OS),SunOS)
+ifndef DISABLE_CXX
 PARALLEL_DIRS += kimwitu++
 endif
+endif
 
 ifeq ($(TARGET_OS),SunOS)
 PARALLEL_DIRS := $(filter-out SPASS, $(PARALLEL_DIRS))

Modified: test-suite/trunk/MultiSource/Benchmarks/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Makefile?rev=81047&r1=81046&r2=81047&view=diff

==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Makefile Fri Sep  4 17:13:52 2009
@@ -3,9 +3,13 @@
 LEVEL = ../..
 PARALLEL_DIRS := Fhourstones Fhourstones-3.1 \
                  McCat Olden OptimizerEval Ptrdist llubenchmark \
-                 sim FreeBench MallocBench Prolangs-C Prolangs-C++ SciMark2-C\
-		 mediabench ASCI_Purple MiBench Trimaran VersaBench tramp3d-v4 NPB-serial\
-		 BitBench ASC_Sequoia PAQ8p
+                 sim FreeBench MallocBench Prolangs-C SciMark2-C\
+                 mediabench ASCI_Purple MiBench Trimaran VersaBench NPB-serial\
+                 BitBench ASC_Sequoia
+
+ifndef DISABLE_CXX
+PARALLEL_DIRS += Prolangs-C++ PAQ8p tramp3d-v4
+endif
 
 ifndef SMALL_PROBLEM_SIZE
 PARALLEL_DIRS += \

Modified: test-suite/trunk/SingleSource/Makefile.singlesrc
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Makefile.singlesrc?rev=81047&r1=81046&r2=81047&view=diff

==============================================================================
--- test-suite/trunk/SingleSource/Makefile.singlesrc (original)
+++ test-suite/trunk/SingleSource/Makefile.singlesrc Fri Sep  4 17:13:52 2009
@@ -16,8 +16,16 @@
 #
 ##===----------------------------------------------------------------------===##
 
+# Force lazy substitution.
+ALL_PROGRAMS_TO_SKIP = $(PROGRAMS_TO_SKIP)
 
-PROGRAMS_TO_TEST = $(filter-out $(PROGRAMS_TO_SKIP), \
+# If DISABLE_CXX is given, add any C++ programs to the list to skip.
+ifdef DISABLE_CXX
+  CXX_SOURCES = $(filter %.cpp %.cc %.mm, $(Source))
+  ALL_PROGRAMS_TO_SKIP += $(patsubst $(SourceDir)%,%,$(basename $(CXX_SOURCES)))
+endif
+
+PROGRAMS_TO_TEST = $(filter-out $(ALL_PROGRAMS_TO_SKIP), \
 	$(patsubst $(SourceDir)%,%,$(basename $(Source))))
 
 include $(LEVEL)/Makefile.programs