git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@42090 91177308-0d34-0410...

[oota-llvm.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 59cd23e03b3878048ce47106ef11436c8a05ec5b..a09f55da572f633d85db104447be2a87156e91ae 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -28,8 +28,18 @@ CLEANED_TESTSUITE := $(patsubst test/%,%,$(CLEANED_TESTSUITE))
 RUNTESTFLAGS := --tool $(CLEANED_TESTSUITE)
 endif
 
+IGNORE_TESTS :=
+
 ifndef RUNLLVM2CPP
-RUNTESTFLAGS += --ignore llvm2cpp.exp
+IGNORE_TESTS += llvm2cpp.exp
+endif
+
+ifndef OCAMLC
+IGNORE_TESTS += ocaml.exp
+endif
+
+ifdef IGNORE_TESTS
+RUNTESTFLAGS += --ignore "$(strip $(IGNORE_TESTS))"
 endif
 
 ifneq ($(RUNTEST),)
@@ -89,6 +99,7 @@ site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
        @echo 'set llvmgxx "$(LLVMGCC)"' >> site.tmp
        @echo 'set llvmgccmajvers "$(LLVMGCC_MAJVERS)"' >> site.tmp
        @echo 'set shlibext "$(SHLIBEXT)"' >> site.tmp
+       @echo 'set ocamlc "$(OCAMLC) -cc $(CXX) -I $(LibDir)/ocaml"' >> 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