For PR780:

[oota-llvm.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 7e3d1290f500a56f35f20f4907da3d26f10e7aca..f06d389261a16b0a6d498eb646cd64d5755b42ed 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -27,8 +27,12 @@ CLEANED_TESTSUITE := $(patsubst %/,%,$(TESTSUITE))
 RUNTESTFLAGS := --tool $(CLEANED_TESTSUITE)
 endif
 
+ifndef RUNLLVM2CPP
+RUNTESTFLAGS += --ignore llvm2cpp.exp
+endif
+
 check-local:: site.exp
-       PATH=$(LLVMToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH) \
+       PATH="$(LLVMToolDir):$(LLVMExmplDir):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH)" \
        $(RUNTEST) $(RUNTESTFLAGS)
 
 clean::
@@ -40,16 +44,21 @@ site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
        @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 target_triplet "$(TARGET_TRIPLE)"' >> site.tmp
+       @echo 'set llvmgcc_version "$(LLVMGCC_VERSION)"' >> site.tmp
        @echo 'set prcontext "$(TCLSH) $(LLVM_SRC_ROOT)/test/Scripts/prcontext.tcl"' >> 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 'set llvmtoolsdir "$(ToolDir)"' >>site.tmp
+       @echo 'set llvmlibsdir "$(LibDir)"' >>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 llvmgcc "PATH=\"$(LLVMToolDir):$(PATH)\" \"$(LLVMGCC)\""' >> site.tmp
+       @echo 'set llvmgxx "PATH=\"$(LLVMToolDir):$(PATH)\" \"$(LLVMGCC)\""' >> site.tmp
+       @echo 'set llvmgccmajvers "$(LLVMGCC_MAJVERS)"' >> 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
        @-rm -f site.bak
        @test ! -f site.exp || mv site.exp site.bak
        @mv site.tmp site.exp
-