SCEV: Add MarkPendingLoopPredicates to avoid recursive isImpliedCond.

[oota-llvm.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 6312a3f606070b8b36817f84ed500846409dae65..ac4eb7dd8c3d37c85b32535d4676de9749b66e1e 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -59,12 +59,12 @@ extra-lit-site-cfgs::
 
 ifneq ($(strip $(filter check-local-all,$(MAKECMDGOALS))),)
 ifndef TESTSUITE
-ifeq ($(shell test -d $(PROJ_SRC_DIR)/../tools/clang && echo OK), OK)
+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-lit-site-cfg: FORCE
-       $(MAKE) -C $(PROJ_OBJ_DIR)/../tools/clang/test lit.site.cfg
+       $(MAKE) -C $(PROJ_OBJ_DIR)/../tools/clang/test lit.site.cfg Unit/lit.site.cfg
 extra-lit-site-cfgs:: clang-lit-site-cfg
 endif
 endif
@@ -121,11 +121,6 @@ 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: //')
@@ -140,29 +135,18 @@ site.exp: FORCE
        @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 llvmshlibdir "$(SharedLibDir)"' >>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 -x 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 'set emitir "$(LLVMCC_EMITIR_FLAG)"' >>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
@@ -170,23 +154,39 @@ site.exp: FORCE
        @test ! -f site.exp || mv site.exp site.bak
        @mv site.tmp site.exp
 
+ifeq ($(DISABLE_ASSERTIONS),1)
+ENABLE_ASSERTIONS=0
+else
+ENABLE_ASSERTIONS=1
+endif
+
 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" \
-            -e "s#@ENABLE_SHARED@#$(ENABLE_SHARED)#g" \
-            $(PROJ_SRC_DIR)/lit.site.cfg.in > $@
+       @$(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=@LLVMGCCDIR@=$(LLVMGCCDIR)=g >> lit.tmp
+       @$(ECHOPATH) s=@PYTHON_EXECUTABLE@=python=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
+       @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..."
-       @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 > $@
-
+       @$(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=@LLVMGCCDIR@=$(LLVMGCCDIR)=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=@SHLIBPATH_VAR@=$(SHLIBPATH_VAR)=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