X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FMakefile;h=724ba01d0f722a52f4f460dbc8b665fe13c880c8;hb=fa5a91a71ee3c62c6f0bc6cc1388175ad6f925c4;hp=1e4111648a7ae13e34f02f683ec468f63c3adaf0;hpb=f780f7765173a9567576e99993a1655601a4e674;p=oota-llvm.git diff --git a/test/Makefile b/test/Makefile index 1e4111648a7..724ba01d0f7 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,73 +1,111 @@ +#===- test/Makefile ----------------------------------------*- Makefile -*--===# +# +# The LLVM Compiler Infrastructure +# +# This file is distributed under the University of Illinois Open Source +# License. See LICENSE.TXT for details. +# +#===------------------------------------------------------------------------===# + LEVEL = .. -DIRS = Programs -include Makefile.tests +DIRS = # -# Make QMTest the default for testing features and regressions +# Make Dejagnu the default for testing # -all:: qmtest +all:: check-local -# -# New QMTest functionality: -# The test suite is being transitioned over to QMTest. Eventually, it -# will use QMTest by default. -# +# Include other test rules +include Makefile.tests -# QMTest option specifying the location of the QMTest database. -QMDB= -D $(LLVM_SRC_ROOT)/test/QMTestDB +#===------------------------------------------------------------------------===# +# DejaGNU testing support +#===------------------------------------------------------------------------===# -# -# This is configuration information used by the test suite. In QM Test, it's -# called a 'context.' -# -CONTEXT= -c srcroot=$(LLVM_SRC_ROOT) \ - -c buildroot=$(LLVM_OBJ_ROOT) \ - -c buildtype=$(CONFIGURATION) \ - -c tmpdir=$(LLVM_OBJ_ROOT)/test/tmp \ - -c coresize=0 \ - -c cc=$(CC) \ - -c cxx=$(CXX) \ - -c "llvmgcc=$(LLVMGCC)" \ - -c make=$(MAKE) +ifdef VERBOSE +RUNTESTFLAGS := $(VERBOSE) +endif -# -# Location of the QMTest program. -# -QMTEST= qmtest $(QMDB) +ifdef TESTSUITE +CLEANED_TESTSUITE := $(patsubst %/,%,$(TESTSUITE)) +CLEANED_TESTSUITE := $(patsubst test/%,%,$(CLEANED_TESTSUITE)) +RUNTESTFLAGS += --tool $(CLEANED_TESTSUITE) +endif +IGNORE_TESTS := -# -# Execute the tests -# -qmtest:: $(LLVM_OBJ_ROOT)/test/tmp register - $(QMTEST) run -O $(LLVM_SRC_ROOT)/test/QMTestDB/expectations.qmr $(CONTEXT) +ifndef RUNLLVM2CPP +IGNORE_TESTS += llvm2cpp.exp +endif -%.t:: $(LLVM_OBJ_ROOT)/test/tmp register - $(QMTEST) run -O $(LLVM_SRC_ROOT)/test/QMTestDB/expectations.qmr $(CONTEXT) $* +IGNORE_TESTS += $(filter-out $(BINDINGS_TO_BUILD:=.exp),$(ALL_BINDINGS:=.exp)) -# -# Create the temporary directory used by the test suite. -# -$(LLVM_OBJ_ROOT)/test/tmp:: - ${MKDIR} $(LLVM_OBJ_ROOT)/test/tmp +ifdef IGNORE_TESTS +RUNTESTFLAGS += --ignore "$(strip $(IGNORE_TESTS))" +endif -# -# Register the python code with QMTest -# -register:: $(LLVM_SRC_ROOT)/test/QMTestDB/QMTest/llvm.pyo +ifneq ($(RUNTEST),) +check-local:: site.exp + ( 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 + +ifdef TESTONE +CLEANED_TESTONE := $(patsubst %/,%,$(TESTONE)) +CLEANED_TESTONE := $(patsubst test/%,%,$(CLEANED_TESTONE)) +SUBDIR := $(shell dirname $(CLEANED_TESTONE)) +TESTPATH := $(LLVM_SRC_ROOT)/test/$(CLEANED_TESTONE) +check-one: site.exp $(TCLSH) + $(Verb)( echo "source $(LLVM_OBJ_ROOT)/test/site.exp" ; \ + echo "set subdir $(SUBDIR)" ; \ + echo "proc pass { msg } { puts \"PASS: \$$msg\" } "; \ + echo "proc fail { msg } { puts \"FAIL: \$$msg\" }" ; \ + echo "proc xfail { msg } { puts \"XFAIL: \$$msg\" }" ; \ + echo "proc xpass { msg } { puts \"XPASS: \$$msg\" }" ; \ + echo "proc verbose args { }" ; \ + echo "source $(LLVM_SRC_ROOT)/test/lib/llvm.exp" ; \ + echo "RunLLVMTests $(TESTPATH)" ) | \ + ( ulimit -t 600 ; ulimit -d 512000 ; \ + PATH="$(LLVMToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH)" \ + $(TCLSH) ) +endif -$(LLVM_SRC_ROOT)/test/QMTestDB/QMTest/llvm.pyo: $(LLVM_SRC_ROOT)/test/QMTestDB/QMTest/llvm.py - $(QMTEST) register test llvm.TestAsmDisasm - $(QMTEST) register test llvm.AssembleTest - $(QMTEST) register test llvm.ConvertToCTest - $(QMTEST) register test llvm.LLToCTest - $(QMTEST) register test llvm.MachineCodeTest - $(QMTEST) register test llvm.AssemblyCodeTest - $(QMTEST) register test llvm.TestOptimizer - $(QMTEST) register test llvm.LLITest - $(QMTEST) register test llvm.TestRunner - $(QMTEST) register test llvm.VerifierTest - $(QMTEST) register test llvm.AnalyzeTest - $(QMTEST) register test llvm.CTest - $(QMTEST) register resource llvm.BytecodeResource +clean:: + $(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...' + @echo '## these variables are automatically generated by make ##' >site.tmp + @echo '# Do not edit here. If you wish to override these values' >>site.tmp + @echo '# edit the last section' >>site.tmp + @echo 'set target_triplet "$(TARGET_TRIPLE)"' >> site.tmp + @echo 'set TARGETS_TO_BUILD "$(TARGETS_TO_BUILD)"' >> site.tmp + @echo 'set llvmgcc_langs "$(LLVMGCC_LANGS)"' >> 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 gccpath "$(CC)"' >>site.tmp + @echo 'set gxxpath "$(CXX)"' >>site.tmp + @echo 'set compile_c "$(CC) $(CPP.Flags) $(CompileCommonOpts) -c "' >>site.tmp + @echo 'set compile_cxx "$(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) -c"' >> site.tmp + @echo 'set link "$(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) $(LD.Flags)"' >>site.tmp + @echo 'set llvmgcc "$(LLVMGCC)"' >> site.tmp + @echo 'set llvmgxx "$(LLVMGCC)"' >> site.tmp + @echo 'set llvmgccmajvers "$(LLVMGCC_MAJVERS)"' >> site.tmp + @echo 'set shlibext "$(SHLIBEXT)"' >> site.tmp + @echo 'set ocamlc "$(OCAMLC) -cc $(CXX) -I $(LibDir)/ocaml"' >> 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 + @-rm -f site.bak + @test ! -f site.exp || mv site.exp site.bak + @mv site.tmp site.exp