tests: CodeGen/X86/GC tests require X86.

[oota-llvm.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index e7776f8459de05b3b574a964e6560a03cfcb0b68..1e179da008acfa6052514a19ef0c0b07f96423db 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -10,11 +10,11 @@
 LEVEL = ..
 DIRS  =
 
-#
-# Make Dejagnu the default for testing
-#
 all:: check-local
 
+# 'lit' is the default test runner.
+check-local:: check-local-lit
+
 # Include other test rules
 include Makefile.tests
 
@@ -84,17 +84,18 @@ else # !SunOS
 ifeq ($(HOST_OS),AuroraUX)
 ULIMIT=ulimit -t 600 ; ulimit -d 512000 ; ulimit -v 512000 ;
 else # !AuroraUX
-ULIMIT=ulimit -t 600 ; ulimit -d 512000 ; ulimit -m 512000 ; ulimit -v 512000 ;
+# Fedora 13 x86-64 python fails with -v 76800
+ULIMIT=ulimit -t 600 ; ulimit -d 512000 ; ulimit -m 512000 ; ulimit -v 1024000 ;
 endif # AuroraUX
 endif # SunOS
 
 ifneq ($(RUNTEST),)
-check-local:: site.exp
+check-local-dg:: site.exp
        ( $(ULIMIT) \
          PATH="$(LLVMToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$(LLVMGCCDIR)/bin:$(PATH)" \
          $(RUNTEST) $(RUNTESTFLAGS) )
 else
-check-local:: site.exp
+check-local-dg:: site.exp
        @echo "*** dejagnu not found.  Make sure 'runtest' is in your PATH, then reconfigure LLVM."
 endif
 
@@ -106,26 +107,6 @@ 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
-
 clean::
        $(RM) -rf `find $(LLVM_OBJ_ROOT)/test -name Output -type d -print`
 
@@ -155,7 +136,6 @@ site.exp: FORCE
        @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 llvmtoolsdir "$(ToolDir)"' >>site.tmp
        @echo 'set llvmlibsdir "$(LibDir)"' >>site.tmp
        @echo 'set llvm_bindings "$(BINDINGS_TO_BUILD)"' >> site.tmp
@@ -170,7 +150,6 @@ site.exp: FORCE
        @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 llvmgccmajvers "$(LLVMGCC_MAJVERS)"' >> 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
@@ -200,4 +179,7 @@ Unit/lit.site.cfg: $(PROJ_OBJ_DIR)/Unit/.dir FORCE
             -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 > $@
+