X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FMakefile;h=724ba01d0f722a52f4f460dbc8b665fe13c880c8;hb=92e73d7628436ef76b0e9bb7f8224f02128e9906;hp=9783f6424bba67506a8cfc7e4fc709eaf5fff2cc;hpb=baf790e8091c3e82225ee8ef462d600da3118944;p=oota-llvm.git diff --git a/test/Makefile b/test/Makefile index 9783f6424bb..724ba01d0f7 100644 --- a/test/Makefile +++ b/test/Makefile @@ -2,8 +2,8 @@ # # The LLVM Compiler Infrastructure # -# This file was developed by the LLVM research group and is distributed under -# the University of Illinois Open Source License. See LICENSE.TXT for details. +# This file is distributed under the University of Illinois Open Source +# License. See LICENSE.TXT for details. # #===------------------------------------------------------------------------===# @@ -11,154 +11,101 @@ LEVEL = .. DIRS = # -# Make QMTest the default for testing features and regressions -# Do this first to force QMTest to run first +# Make Dejagnu the default for testing # -all:: qmtest +all:: check-local # Include other test rules include Makefile.tests -# New QMTest functionality: -# The test suite is being transitioned over to QMTest. Eventually, it -# will use QMTest by default. - -# QMTest option specifying the location of the QMTest database. -QMDB= -D $(LLVM_SRC_ROOT)/test -QMCLASSES=$(LLVM_OBJ_ROOT)/test/QMTest - -# -# Determine which expectations file we will use -# -QMEXPECT:=$(LLVM_SRC_ROOT)/test/QMTest/expectations.unknown.qmr -ifeq ($(OS),Linux) -QMEXPECT:=$(LLVM_SRC_ROOT)/test/QMTest/expectations.linux.qmr -endif +#===------------------------------------------------------------------------===# +# DejaGNU testing support +#===------------------------------------------------------------------------===# -ifeq ($(OS),SunOS) -QMEXPECT:=$(LLVM_SRC_ROOT)/test/QMTest/expectations.sunos.qmr +ifdef VERBOSE +RUNTESTFLAGS := $(VERBOSE) endif -ifeq ($(OS),Darwin) -QMEXPECT:=$(LLVM_SRC_ROOT)/test/QMTest/expectations.darwin.qmr +ifdef TESTSUITE +CLEANED_TESTSUITE := $(patsubst %/,%,$(TESTSUITE)) +CLEANED_TESTSUITE := $(patsubst test/%,%,$(CLEANED_TESTSUITE)) +RUNTESTFLAGS += --tool $(CLEANED_TESTSUITE) endif -# -# 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=$(BuildMode)" \ - -c "tmpdir=$(LLVM_OBJ_ROOT)/test/tmp" \ - -c "coresize=0" \ - -c "cc=$(CC)" \ - -c "cxx=$(CXX)" \ - -c "llvmgcc=$(LLVMGCC)" \ - -c "llvmgxx=$(LLVMGXX)" \ - -c "make=$(MAKE)" \ - -c "python=$(PYTHON)" - -# -# Location of the QMTest program. -# -QMTEST= QMTEST_CLASS_PATH=$(QMCLASSES) qmtest $(QMDB) - - -# -# Execute the tests -# -qmtest:: $(LLVM_OBJ_ROOT)/test/tmp register - -$(QMTEST) run -O $(QMEXPECT) $(CONTEXT) - -%.t:: $(LLVM_OBJ_ROOT)/test/tmp register - -$(QMTEST) run -O $(QMEXPECT) $(CONTEXT) $* +IGNORE_TESTS := -# -# Create the temporary directory used by the test suite. -# -$(LLVM_OBJ_ROOT)/test/tmp:: - ${MKDIR} $(LLVM_OBJ_ROOT)/test/tmp - -# -# Right now, QMTest compiles the python test classes and put them into the -# source tree. Since Python bytecode is *not* cross-platform compatible (I -# think), we'll regenerate every time. -# -# Simultaneous builds won't work, but shared source trees will. -# -register: - $(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.TestOptimizer - $(QMTEST) register test llvm.LLITest - $(QMTEST) register test llvm.TestRunner - $(QMTEST) register test llvm.VerifierTest - $(QMTEST) register test llvm.CTest - $(QMTEST) register test llvm.CXXTest - $(QMTEST) register database llvmdb.llvmdb - -# Start up the QMTest GUI -gui:: - $(QMTEST) gui --no-browser --daemon - -# Also get rid of qmtest garbage when we 'make clean' in this directory. -clean:: qmtest-clean +ifndef RUNLLVM2CPP +IGNORE_TESTS += llvm2cpp.exp +endif -qmtest-clean: - $(RM) -rf $(LLVM_OBJ_ROOT)/test/tmp - $(RM) -f $(LLVM_SRC_ROOT)/test/QMTest/*.pyo \ - $(LLVM_OBJ_ROOT)/test/QMTest/*.pyo - $(RM) -f $(LLVM_SRC_ROOT)/test/results.qmr \ - $(LLVM_OBJ_ROOT)/test/results.qmr +IGNORE_TESTS += $(filter-out $(BINDINGS_TO_BUILD:=.exp),$(ALL_BINDINGS:=.exp)) -#===------------------------------------------------------------------------===# -# DejaGNU testing support -#===------------------------------------------------------------------------===# - -ifdef TESTSUITE -RUNTESTFLAGS := --tool $(TESTSUITE) +ifdef IGNORE_TESTS +RUNTESTFLAGS += --ignore "$(strip $(IGNORE_TESTS))" endif -check-dejagnu: site.exp - -PATH=$(LLVMToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH) \ - $(RUNTEST) $(RUNTESTFLAGS) +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 -dejagnu-clean: - $(RM) -rf `find $(LLVM_OBJ_ROOT)/test/Regression -name Output -type d -print` +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 prcontext "tclsh $(LLVM_SRC_ROOT)/test/Scripts/prcontext.tcl"' >> site.tmp - @echo 'set srcdir $(LLVM_SRC_ROOT)/test' >>site.tmp - @echo "set objdir $(LLVM_OBJ_ROOT)/test" >>site.tmp - @echo 'set llvmgcc $(LLVMGCCDIR)/bin/gcc' >> site.tmp - @echo 'set llvmgxx $(LLVMGCCDIR)/bin/g++' >> 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 - -#===------------------------------------------------------------------------===# -# quick-test utility. Just runs TestRunner.sh on all the *.ll files in a -# directory. Use like this: -# cd llvm/test ; make quick-test QUICKTEST=Regression/Bytecode -# where QUICKTEST specifies the directory you want to run the tests on. -#===------------------------------------------------------------------------===# -quick-test: - @if test -d "${QUICKTEST}" ; then \ - cd $(LLVM_SRC_ROOT)/test/$(QUICKTEST) ; \ - find . -name \*.ll -print -exec $(LLVM_SRC_ROOT)/test/TestRunner.sh {} \; ; \ - else \ - echo "Set QUICKTEST=