X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FMakefile;h=724ba01d0f722a52f4f460dbc8b665fe13c880c8;hb=fa5a91a71ee3c62c6f0bc6cc1388175ad6f925c4;hp=a09f55da572f633d85db104447be2a87156e91ae;hpb=0908d49c22775d20a88f595845b515f669d528f7;p=oota-llvm.git

diff --git a/test/Makefile b/test/Makefile
index a09f55da572..724ba01d0f7 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.
 # 
 #===------------------------------------------------------------------------===#
 
@@ -22,10 +22,14 @@ 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 :=
@@ -34,9 +38,7 @@ ifndef RUNLLVM2CPP
 IGNORE_TESTS += llvm2cpp.exp
 endif
 
-ifndef OCAMLC
-IGNORE_TESTS += ocaml.exp
-endif
+IGNORE_TESTS += $(filter-out $(BINDINGS_TO_BUILD:=.exp),$(ALL_BINDINGS:=.exp))
 
 ifdef IGNORE_TESTS
 RUNTESTFLAGS += --ignore "$(strip $(IGNORE_TESTS))"
@@ -64,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 ; \
@@ -92,8 +95,8 @@ site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
 	@echo 'set objdir "$(LLVM_OBJ_ROOT)/test"' >>site.tmp
 	@echo 'set gccpath "$(CC)"' >>site.tmp
 	@echo 'set gxxpath "$(CXX)"' >>site.tmp
-	@echo 'set compile_c "$(CC) $(CPP.Flags) $(C.Flags) $(CompileCommonOpts) -c "' >>site.tmp
-	@echo 'set compile_cxx "$(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) - c"' >> site.tmp
+	@echo 'set compile_c "$(CC) $(CPP.Flags) $(CompileCommonOpts) -c "' >>site.tmp
+	@echo 'set compile_cxx "$(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) -c"' >> site.tmp
 	@echo 'set link "$(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) $(LD.Flags)"' >>site.tmp
 	@echo 'set llvmgcc "$(LLVMGCC)"' >> site.tmp
 	@echo 'set llvmgxx "$(LLVMGCC)"' >> site.tmp