Fix PR2096, a regression introduced with my patch last night. This

[oota-llvm.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 59cd23e03b3878048ce47106ef11436c8a05ec5b..00c5ef268d79922cfbff36ada93d5480234c7f7a 100644 (file)
--- 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.
 # 
 #===------------------------------------------------------------------------===#
 
@@ -22,14 +22,26 @@ include Makefile.tests
 # DejaGNU testing support
 #===------------------------------------------------------------------------===#
 
+ifdef VERBOSE
+RUNTESTFLAGS := $(VERBOSE)
+endif
+
 ifdef TESTSUITE
 CLEANED_TESTSUITE := $(patsubst %/,%,$(TESTSUITE))
 CLEANED_TESTSUITE := $(patsubst test/%,%,$(CLEANED_TESTSUITE))
-RUNTESTFLAGS := --tool $(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),)
@@ -54,6 +66,7 @@ check-one: site.exp $(TCLSH)
          echo "proc fail  { msg } { puts \"FAIL: \$$msg\" }" ; \
          echo "proc xfail { msg } { puts \"XFAIL: \$$msg\" }" ; \
          echo "proc xpass { msg } { puts \"XPASS: \$$msg\" }" ; \
+         echo "proc verbose args { }" ; \
          echo "source $(LLVM_SRC_ROOT)/test/lib/llvm.exp" ; \
          echo "RunLLVMTests $(TESTPATH)" ) | \
        ( ulimit -t 600 ; ulimit -d 512000 ; \
@@ -89,6 +102,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