X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FMakefile;h=c0f37e94fb13f03f43eda3d9a1deac43a97b651b;hb=0f7ea1ab106ffb3c8e23a87c0687f85132d93ca1;hp=59cd23e03b3878048ce47106ef11436c8a05ec5b;hpb=e41f23f93acab3f8037f5535b0ad39322c5266f7;p=oota-llvm.git

diff --git a/test/Makefile b/test/Makefile
index 59cd23e03b3..c0f37e94fb1 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,8 +2,8 @@
 # 
 #                     The LLVM Compiler Infrastructure
 #
-# This file was developed by the LLVM research group and is distributed under
-# the University of Illinois Open Source License. See LICENSE.TXT for details.
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
 # 
 #===------------------------------------------------------------------------===#
 
@@ -28,8 +28,16 @@ CLEANED_TESTSUITE := $(patsubst test/%,%,$(CLEANED_TESTSUITE))
 RUNTESTFLAGS := --tool $(CLEANED_TESTSUITE)
 endif
 
+IGNORE_TESTS :=
+
 ifndef RUNLLVM2CPP
-RUNTESTFLAGS += --ignore llvm2cpp.exp
+IGNORE_TESTS += llvm2cpp.exp
+endif
+
+IGNORE_TESTS += $(filter-out $(BINDINGS_TO_BUILD:=.exp),$(ALL_BINDINGS:=.exp))
+
+ifdef IGNORE_TESTS
+RUNTESTFLAGS += --ignore "$(strip $(IGNORE_TESTS))"
 endif
 
 ifneq ($(RUNTEST),)
@@ -89,6 +97,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