new testcase

[oota-llvm.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 4529619536633bb326a3efb6a111034226c365a8..5ecc4a227c5214bbfdfac40a960ae843b723168e 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -24,16 +24,26 @@ include Makefile.tests
 
 ifdef TESTSUITE
 CLEANED_TESTSUITE := $(patsubst %/,%,$(TESTSUITE))
+CLEANED_TESTSUITE := $(patsubst test/%,%,$(CLEANED_TESTSUITE))
 RUNTESTFLAGS := --tool $(CLEANED_TESTSUITE)
 endif
 
+ifndef RUNLLVM2CPP
+RUNTESTFLAGS += --ignore llvm2cpp.exp
+endif
+
+ifneq ($(RUNTEST),)
 check-local:: site.exp
-       PATH="$(LLVMToolDir):$(LLVMExmplDir):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH)" \
-       $(RUNTEST) $(RUNTESTFLAGS)
+       ( ulimit -t 600 ; ulimit -d 512000 ; \
+         PATH="$(LLVMToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH)" \
+         $(RUNTEST) $(RUNTESTFLAGS) )
+else
+check-local:: site.exp
+       @echo "*** dejagnu not found.  Make sure runtest is in your PATH, then reconfigure llvm."
+endif
 
 clean::
-       $(RM) -rf `find $(LLVM_OBJ_ROOT)/test/Regression -name Output -type d -print`
-       $(RM) -rf `find $(LLVM_OBJ_ROOT)/test/Feature -name Output -type d -print`
+       $(RM) -rf `find $(LLVM_OBJ_ROOT)/test -name Output -type d -print`
 
 site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
        @echo 'Making a new site.exp file...'
@@ -43,11 +53,16 @@ site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
        @echo 'set target_triplet "$(TARGET_TRIPLE)"' >> site.tmp
        @echo 'set llvmgcc_version "$(LLVMGCC_VERSION)"' >> site.tmp
        @echo 'set prcontext "$(TCLSH) $(LLVM_SRC_ROOT)/test/Scripts/prcontext.tcl"' >> site.tmp
+       @echo 'set llvmtoolsdir "$(ToolDir)"' >>site.tmp
+       @echo 'set llvmlibsdir "$(LibDir)"' >>site.tmp
+       @echo 'set srcroot "$(LLVM_SRC_ROOT)"' >>site.tmp
+       @echo 'set objroot "$(LLVM_OBJ_ROOT)"' >>site.tmp
        @echo 'set srcdir "$(LLVM_SRC_ROOT)/test"' >>site.tmp
        @echo 'set objdir "$(LLVM_OBJ_ROOT)/test"' >>site.tmp
        @echo 'set llvmgcc "PATH=\"$(LLVMToolDir):$(PATH)\" \"$(LLVMGCC)\""' >> site.tmp
        @echo 'set llvmgxx "PATH=\"$(LLVMToolDir):$(PATH)\" \"$(LLVMGCC)\""' >> site.tmp
        @echo 'set llvmgccmajvers "$(LLVMGCC_MAJVERS)"' >> site.tmp
+       @echo 'set gxxcmd "$(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts)"' >> site.tmp
        @echo '## All variables above are generated by configure. Do Not Edit ## ' >>site.tmp
        @test ! -f site.exp || \
        sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp