test: Use $SharedLibDir for loadable modules. On Cygming, loadable modules are not...

[oota-llvm.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index c11c2a7fcdec5c6f1e3c929693ed0a1b004b9317..4218fadf1d2903245f7634127a0a1c4ba02cf2dd 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -33,6 +33,11 @@ else
 LIT_ARGS := -s -v
 endif
 
+# -jN causes crash on Cygwin's python.
+ifneq (,$(filter $(HOST_OS),Cygwin))
+  LIT_ARGS += -j1
+endif
+
 ifdef TESTSUITE
 LIT_TESTSUITE := $(TESTSUITE)
 CLEANED_TESTSUITE := $(patsubst %/,%,$(TESTSUITE))
@@ -84,8 +89,8 @@ 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 ;
+# 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
 
@@ -138,6 +143,7 @@ site.exp: FORCE
        @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
@@ -146,7 +152,7 @@ site.exp: FORCE
        @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 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
@@ -157,6 +163,7 @@ site.exp: FORCE
        @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,6 +177,7 @@ lit.site.cfg: site.exp
             -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 > $@
 
 Unit/lit.site.cfg: $(PROJ_OBJ_DIR)/Unit/.dir FORCE
@@ -180,6 +188,7 @@ Unit/lit.site.cfg: $(PROJ_OBJ_DIR)/Unit/.dir FORCE
             -e "s#@LLVMGCCDIR@#$(LLVMGCCDIR)#g" \
             -e "s#@LLVM_BUILD_MODE@#$(BuildMode)#g" \
             -e "s#@ENABLE_SHARED@#$(ENABLE_SHARED)#g" \
+            -e "s#@SHLIBDIR@#$(SharedLibDir)#g" \
             -e "s#@SHLIBPATH_VAR@#$(SHLIBPATH_VAR)#g" \
             $(PROJ_SRC_DIR)/Unit/lit.site.cfg.in > $@