X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FMakefile;h=556f97651957958b2d74f6bbbd32f211a3653fcc;hb=fc6cc0edd6589a01f53d497e3c3e4bf8b290f7e2;hp=f8810e73f41b83af47d63a86704941c5d45c0b58;hpb=538a317d0386eb815cc77ea9324a27eda8d00cf0;p=oota-llvm.git

diff --git a/test/Makefile b/test/Makefile
index f8810e73f41..dc99fe1a2f2 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,75 +1,152 @@
-LEVEL  = ..
-DIRS   = Programs
-include Makefile.tests
-
+#===- test/Makefile ----------------------------------------*- Makefile -*--===#
 #
-# Make QMTest the default for testing features and regressions
-#
-all:: qmtest
-
+#                     The LLVM Compiler Infrastructure
 #
-# New QMTest functionality:
-#	The test suite is being transitioned over to QMTest.  Eventually, it
-#	will use QMTest by default.
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
 #
+#===------------------------------------------------------------------------===#
 
-# QMTest option specifying the location of the QMTest database.
-QMDB= -D $(LLVM_SRC_ROOT)/test/QMTestDB
+LEVEL = ..
+DIRS  =
 
-#
-# 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)
+all:: check-local
 
-#
-# Location of the QMTest program.
-#
-QMTEST= qmtest $(QMDB)
+# Include other test rules
+include Makefile.tests
 
+#===------------------------------------------------------------------------===#
+# DejaGNU testing support
+#===------------------------------------------------------------------------===#
 
-#
-# Execute the tests
-#
-qmtest:: $(LLVM_OBJ_ROOT)/test/tmp register
-	$(QMTEST) run -O $(LLVM_SRC_ROOT)/test/QMTestDB/expectations.qmr $(CONTEXT)
+ifneq ($(GREP_OPTIONS),)
+$(warning GREP_OPTIONS environment variable may interfere with test results)
+endif
 
-%.t:: $(LLVM_OBJ_ROOT)/test/tmp register
-	$(QMTEST) run -O $(LLVM_SRC_ROOT)/test/QMTestDB/expectations.qmr $(CONTEXT) $*
+ifdef VERBOSE
+LIT_ARGS := -v
+else
+LIT_ARGS := -s -v
+endif
 
-#
-# Create the temporary directory used by the test suite.
-#
-$(LLVM_OBJ_ROOT)/test/tmp::
-	${MKDIR} $(LLVM_OBJ_ROOT)/test/tmp
+ifdef TESTSUITE
+LIT_TESTSUITE := $(TESTSUITE)
+else
+LIT_TESTSUITE := .
+endif
 
-#
-# 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.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
+# Check what to run for -all.
+LIT_ALL_TESTSUITES := $(LIT_TESTSUITE)
+
+extra-site-cfgs::
+.PHONY: extra-site-cfgs
+
+ifneq ($(strip $(filter check-local-all,$(MAKECMDGOALS))),)
+ifndef TESTSUITE
+ifeq ($(shell test -f $(PROJ_OBJ_DIR)/../tools/clang/Makefile && echo OK), OK)
+LIT_ALL_TESTSUITES += $(PROJ_OBJ_DIR)/../tools/clang/test
+
+# Force creation of Clang's lit.site.cfg.
+clang-site-cfg: FORCE
+	$(MAKE) -C $(PROJ_OBJ_DIR)/../tools/clang/test lit.site.cfg Unit/lit.site.cfg
+extra-site-cfgs:: clang-site-cfg
+endif
+
+ifeq ($(shell test -f $(PROJ_OBJ_DIR)/../tools/clang/tools/extra/Makefile && echo OK), OK)
+LIT_ALL_TESTSUITES += $(PROJ_OBJ_DIR)/../tools/clang/tools/extra/test
+
+# Force creation of Clang Tools' lit.site.cfg.
+clang-tools-site-cfg: FORCE
+	$(MAKE) -C $(PROJ_OBJ_DIR)/../tools/clang/tools/extra/test lit.site.cfg
+extra-site-cfgs:: clang-tools-site-cfg
+endif
+
+ifeq ($(shell test -f $(PROJ_OBJ_DIR)/../tools/polly/Makefile && echo OK), OK)
+LIT_ALL_TESTSUITES += $(PROJ_OBJ_DIR)/../tools/polly/test
+
+# Force creation of Polly's lit.site.cfg.
+polly-tools-site-cfg: FORCE
+	$(MAKE) -C $(PROJ_OBJ_DIR)/../tools/polly/test lit.site.cfg
+extra-site-cfgs:: polly-tools-site-cfg
+endif
+endif
+endif
+
+# 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
+# Newer versions of python try to allocate an insane amount of address space for
+# its thread-local storage, don't set a limit here.
+# When -v is not used, then -s has to be used to limit the stack size.
+# FIXME: Those limits should be enforced by lit instead of globally.
+ULIMIT=ulimit -t 600 ; ulimit -d 512000 ; ulimit -m 512000 ; ulimit -s 8192 ;
+endif # AuroraUX
+endif # SunOS
+
+check-local:: lit.site.cfg Unit/lit.site.cfg
+	( $(ULIMIT) \
+	  $(PYTHON) $(LLVM_SRC_ROOT)/utils/lit/lit.py $(LIT_ARGS) $(LIT_TESTSUITE) )
+
+# This is a legacy alias dating from when both DejaGNU and lit were in use.
+check-local-lit:: check-local
+
+check-local-all:: lit.site.cfg Unit/lit.site.cfg extra-site-cfgs
+	( $(ULIMIT) \
+	  $(PYTHON) $(LLVM_SRC_ROOT)/utils/lit/lit.py $(LIT_ARGS) $(LIT_ALL_TESTSUITES) )
+
+clean::
+	$(RM) -rf `find $(LLVM_OBJ_ROOT)/test -name Output -type d -print`
+
+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
+
+FORCE:
+
+ifeq ($(DISABLE_ASSERTIONS),1)
+ENABLE_ASSERTIONS=0
+else
+ENABLE_ASSERTIONS=1
+endif
+
+lit.site.cfg: FORCE
+	@echo "Making LLVM 'lit.site.cfg' file..."
+	@$(ECHOPATH) s=@LLVM_HOST_TRIPLE@=$(HOST_TRIPLE)=g > lit.tmp
+	@$(ECHOPATH) s=@TARGET_TRIPLE@=$(TARGET_TRIPLE)=g >> lit.tmp
+	@$(ECHOPATH) s=@LLVM_SOURCE_DIR@=$(LLVM_SRC_ROOT)=g >> lit.tmp
+	@$(ECHOPATH) s=@LLVM_BINARY_DIR@=$(LLVM_OBJ_ROOT)=g >> lit.tmp
+	@$(ECHOPATH) s=@LLVM_TOOLS_DIR@=$(ToolDir)=g >> lit.tmp
+	@$(ECHOPATH) s=@SHLIBDIR@=$(SharedLibDir)=g >> lit.tmp
+	@$(ECHOPATH) s=@SHLIBEXT@=$(SHLIBEXT)=g >> lit.tmp
+	@$(ECHOPATH) s=@EXEEXT@=$(EXEEXT)=g >> lit.tmp
+	@$(ECHOPATH) s=@PYTHON_EXECUTABLE@=$(PYTHON)=g >> lit.tmp
+	@$(ECHOPATH) s=@OCAMLOPT@=$(OCAMLOPT) -cc $(subst *,'\\\"',*$(subst =,"\\=",$(CXX_FOR_OCAMLOPT))*) -cclib -L$(LibDir) -I $(LibDir)/ocaml=g >> lit.tmp
+	@$(ECHOPATH) s=@ENABLE_SHARED@=$(ENABLE_SHARED)=g >> lit.tmp
+	@$(ECHOPATH) s=@ENABLE_ASSERTIONS@=$(ENABLE_ASSERTIONS)=g >> lit.tmp
+	@$(ECHOPATH) s=@TARGETS_TO_BUILD@=$(TARGETS_TO_BUILD)=g >> lit.tmp
+	@$(ECHOPATH) s=@LLVM_BINDINGS@=$(BINDINGS_TO_BUILD)=g >> lit.tmp
+	@$(ECHOPATH) s=@HOST_OS@=$(HOST_OS)=g >> lit.tmp
+	@$(ECHOPATH) s=@HOST_ARCH@=$(HOST_ARCH)=g >> lit.tmp
+	@$(ECHOPATH) s=@HAVE_LIBZ@=$(HAVE_LIBZ)=g >> lit.tmp
+	@sed -f lit.tmp $(PROJ_SRC_DIR)/lit.site.cfg.in > $@
+	@-rm -f lit.tmp
 
+Unit/lit.site.cfg: $(PROJ_OBJ_DIR)/Unit/.dir FORCE
+	@echo "Making LLVM unittest 'lit.site.cfg' file..."
+	@$(ECHOPATH) s=@LLVM_SOURCE_DIR@=$(LLVM_SRC_ROOT)=g > unit.tmp
+	@$(ECHOPATH) s=@LLVM_BINARY_DIR@=$(LLVM_OBJ_ROOT)=g >> unit.tmp
+	@$(ECHOPATH) s=@LLVM_TOOLS_DIR@=$(ToolDir)=g >> unit.tmp
+	@$(ECHOPATH) s=@LLVM_BUILD_MODE@=$(BuildMode)=g >> unit.tmp
+	@$(ECHOPATH) s=@ENABLE_SHARED@=$(ENABLE_SHARED)=g >> unit.tmp
+	@$(ECHOPATH) s=@SHLIBDIR@=$(SharedLibDir)=g >> unit.tmp
+	@$(ECHOPATH) s=@HOST_OS@=$(HOST_OS)=g >> unit.tmp
+	@$(ECHOPATH) s=@HOST_ARCH@=$(HOST_ARCH)=g >> lit.tmp
+	@sed -f unit.tmp $(PROJ_SRC_DIR)/Unit/lit.site.cfg.in > $@
+	@-rm -f unit.tmp