X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FMakefile;h=044f75ba7487c4a85f03989293429e07075b50db;hb=d805bcbb0662ef82aa3864cd71a26dedbcc38e79;hp=adbca665a98ca9d9be960fde325cdba8881806f3;hpb=491e9cd1828b757ee89c37817b01fa0d8808afe5;p=oota-llvm.git

diff --git a/test/Makefile b/test/Makefile
index adbca665a98..044f75ba748 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,148 +1,182 @@
 #===- test/Makefile ----------------------------------------*- Makefile -*--===#
-# 
+#
 #                     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.
+#
 #===------------------------------------------------------------------------===#
 
-LEVEL  = ..
-DIRS   = 
+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
+#===------------------------------------------------------------------------===#
+# DejaGNU testing support
+#===------------------------------------------------------------------------===#
 
-#
-# 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
+ifneq ($(GREP_OPTIONS),)
+$(warning GREP_OPTIONS environment variable may interfere with test results)
 endif
 
-ifeq ($(OS),SunOS)
-QMEXPECT:=$(LLVM_SRC_ROOT)/test/QMTest/expectations.sunos.qmr
+ifdef VERBOSE
+RUNTESTFLAGS := $(VERBOSE)
+LIT_ARGS := -v
+else
+LIT_ARGS := -s -v
 endif
 
-ifeq ($(OS),Darwin)
-QMEXPECT:=$(LLVM_SRC_ROOT)/test/QMTest/expectations.darwin.qmr
+ifdef TESTSUITE
+LIT_TESTSUITE := $(TESTSUITE)
+CLEANED_TESTSUITE := $(patsubst %/,%,$(TESTSUITE))
+CLEANED_TESTSUITE := $(patsubst test/%,%,$(CLEANED_TESTSUITE))
+RUNTESTFLAGS += --tool $(CLEANED_TESTSUITE)
+else
+LIT_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)"
+ifdef VG
+VALGRIND := valgrind --tool=memcheck --quiet --trace-children=yes --error-exitcode=3 --leak-check=full $(VALGRIND_EXTRA_ARGS)
+endif
 
-#
-# Location of the QMTest program.
-#
-QMTEST= QMTEST_CLASS_PATH=$(QMCLASSES) qmtest $(QMDB)
+# Check what to run for -all.
+LIT_ALL_TESTSUITES := $(LIT_TESTSUITE)
 
+extra-lit-site-cfgs::
+.PHONY: extra-lit-site-cfgs
 
-#
-# Execute the tests
-#
-qmtest:: $(LLVM_OBJ_ROOT)/test/tmp register
-	-$(QMTEST) run -O $(QMEXPECT) $(CONTEXT)
+ifneq ($(strip $(filter check-local-all,$(MAKECMDGOALS))),)
+ifndef TESTSUITE
+ifeq ($(shell test -d $(PROJ_SRC_DIR)/../tools/clang && echo OK), OK)
+LIT_ALL_TESTSUITES += $(PROJ_OBJ_DIR)/../tools/clang/test
 
-%.t:: $(LLVM_OBJ_ROOT)/test/tmp register
-	-$(QMTEST) run -O $(QMEXPECT) $(CONTEXT) $*
+# Force creation of Clang's lit.site.cfg.
+clang-lit-site-cfg: FORCE
+	$(MAKE) -C $(PROJ_OBJ_DIR)/../tools/clang/test lit.site.cfg
+extra-lit-site-cfgs:: clang-lit-site-cfg
+endif
+endif
+endif
 
-#
-# Create the temporary directory used by the test suite.
-#
-$(LLVM_OBJ_ROOT)/test/tmp::
-	${MKDIR} $(LLVM_OBJ_ROOT)/test/tmp
+IGNORE_TESTS :=
 
-#
-# 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
-
-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
+ifndef RUNLLVM2CPP
+IGNORE_TESTS += llvm2cpp.exp
+endif
 
-#===------------------------------------------------------------------------===#
-# DejaGNU testing support
-#===------------------------------------------------------------------------===#
+ifdef IGNORE_TESTS
+RUNTESTFLAGS += --ignore "$(strip $(IGNORE_TESTS))"
+endif
 
-RUNTEST = runtest
+# ulimits like these are redundantly enforced by the buildbots, so
+# just removing them here won't work.
+# Both AuroraUX & Solaris do not have the -m flag for ulimit
+ifeq ($(HOST_OS),SunOS)
+ULIMIT=ulimit -t 600 ; ulimit -d 512000 ; ulimit -v 512000 ;
+else # !SunOS
+ifeq ($(HOST_OS),AuroraUX)
+ULIMIT=ulimit -t 600 ; ulimit -d 512000 ; ulimit -v 512000 ;
+else # !AuroraUX
+# Fedora 13 x86-64 python fails with -v 51200
+ULIMIT=ulimit -t 600 ; ulimit -d 512000 ; ulimit -m 512000 ; ulimit -v 768000 ;
+endif # AuroraUX
+endif # SunOS
+
+ifneq ($(RUNTEST),)
+check-local:: site.exp
+	( $(ULIMIT) \
+	  PATH="$(LLVMToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$(LLVMGCCDIR)/bin:$(PATH)" \
+	  $(RUNTEST) $(RUNTESTFLAGS) )
+else
+check-local:: site.exp
+	@echo "*** dejagnu not found.  Make sure 'runtest' is in your PATH, then reconfigure LLVM."
+endif
 
-ifdef TESTSUITE
-RUNTESTFLAGS := --tool $(TEST)
+check-local-lit:: lit.site.cfg Unit/lit.site.cfg
+	( $(ULIMIT) \
+	  $(LLVM_SRC_ROOT)/utils/lit/lit.py $(LIT_ARGS) $(LIT_TESTSUITE) )
+
+check-local-all:: lit.site.cfg Unit/lit.site.cfg extra-lit-site-cfgs
+	( $(ULIMIT) \
+	  $(LLVM_SRC_ROOT)/utils/lit/lit.py $(LIT_ARGS) $(LIT_ALL_TESTSUITES) )
+
+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) \
+	  PATH="$(LLVMToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH)" \
+	  $(TCLSH) )
 endif
 
-check-dejagnu: site.exp
-	PATH=$(LLVM_SRC_ROOT)/test/Scripts:$(PATH) $(RUNTEST) $(RUNTESTFLAGS)
+clean::
+	$(RM) -rf `find $(LLVM_OBJ_ROOT)/test -name Output -type d -print`
 
+# dsymutil is used on the Darwin to manipulate DWARF debugging information.
+ifeq ($(TARGET_OS),Darwin)
+DSYMUTIL=dsymutil
+else
+DSYMUTIL=true
+endif
+ifdef TargetCommonOpts
+BUGPOINT_TOPTS="-gcc-tool-args $(TargetCommonOpts)"
+else
+BUGPOINT_TOPTS=""
+endif
+
+ifneq ($(OCAMLOPT),)
+CC_FOR_OCAMLOPT := $(shell $(OCAMLOPT) -config | grep native_c_compiler | sed -e 's/native_c_compiler: //')
+CXX_FOR_OCAMLOPT := $(subst gcc,g++,$(CC_FOR_OCAMLOPT))
+endif
 
-dejagnu-clean:
-	$(RM) -rf `find $(LLVM_OBJ_ROOT)/test/Regression -name Output -type d -print`
+FORCE:
 
-site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
+site.exp: FORCE
 	@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 $(LLVM_SRC_ROOT)/test/Scripts/prcontext.py' >> 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 '## Autogenerated by LLVM configuration.' > site.tmp
+	@echo '# Do not edit!' >> 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 llvmtoolsdir "$(ToolDir)"' >>site.tmp
+	@echo 'set llvmlibsdir "$(LibDir)"' >>site.tmp
+	@echo 'set llvm_bindings "$(BINDINGS_TO_BUILD)"' >> 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) $(TargetCommonOpts) $(CompileCommonOpts) -c '"' >>site.tmp
+	@echo 'set compile_cxx "' $(CXX) $(CPP.Flags) $(CXX.Flags) $(TargetCommonOpts) $(CompileCommonOpts) -c '"' >> site.tmp
+	@echo 'set link "' $(CXX) $(CPP.Flags) $(CXX.Flags) $(TargetCommonOpts) $(CompileCommonOpts) $(LD.Flags) '"' >>site.tmp
+	@echo 'set llvmgcc "$(LLVMGCC) $(TargetCommonOpts) $(EXTRA_OPTIONS)"' >> site.tmp
+	@echo 'set llvmgxx "$(LLVMGCC) $(TargetCommonOpts) $(EXTRA_OPTIONS)"' >> site.tmp
+	@echo 'set bugpoint_topts $(BUGPOINT_TOPTS)' >> site.tmp
+	@echo 'set shlibext "$(SHLIBEXT)"' >> site.tmp
+	@echo 'set ocamlopt "$(OCAMLOPT) -cc \"$(CXX_FOR_OCAMLOPT)\" -I $(LibDir)/ocaml"' >> site.tmp
+	@echo 'set valgrind "$(VALGRIND)"' >> site.tmp
+	@echo 'set grep "$(GREP)"' >>site.tmp
+	@echo 'set gas "$(GAS)"' >>site.tmp
+	@echo 'set llvmdsymutil "$(DSYMUTIL)"' >>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
@@ -150,3 +184,22 @@ site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
 	@test ! -f site.exp || mv site.exp site.bak
 	@mv site.tmp site.exp
 
+lit.site.cfg: site.exp
+	@echo "Making LLVM 'lit.site.cfg' file..."
+	@sed -e "s#@LLVM_SOURCE_DIR@#$(LLVM_SRC_ROOT)#g" \
+	     -e "s#@LLVM_BINARY_DIR@#$(LLVM_OBJ_ROOT)#g" \
+	     -e "s#@LLVM_TOOLS_DIR@#$(ToolDir)#g" \
+	     -e "s#@LLVMGCCDIR@#$(LLVMGCCDIR)#g" \
+	     $(PROJ_SRC_DIR)/lit.site.cfg.in > $@
+
+Unit/lit.site.cfg: $(PROJ_OBJ_DIR)/Unit/.dir FORCE
+	@echo "Making LLVM unittest 'lit.site.cfg' file..."
+	@sed -e "s#@LLVM_SOURCE_DIR@#$(LLVM_SRC_ROOT)#g" \
+	     -e "s#@LLVM_BINARY_DIR@#$(LLVM_OBJ_ROOT)#g" \
+	     -e "s#@LLVM_TOOLS_DIR@#$(ToolDir)#g" \
+	     -e "s#@LLVMGCCDIR@#$(LLVMGCCDIR)#g" \
+	     -e "s#@LLVM_BUILD_MODE@#$(BuildMode)#g" \
+	     -e "s#@ENABLE_SHARED@#$(ENABLE_SHARED)#g" \
+	     -e "s#@SHLIBPATH_VAR@#$(SHLIBPATH_VAR)#g" \
+	     $(PROJ_SRC_DIR)/Unit/lit.site.cfg.in > $@
+