git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@42090 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Makefile b/test/Makefile
index 59cd23e..a09f55d 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -28,8 +28,18 @@
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 @@
@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