projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix PR3304
[oota-llvm.git]
/
test
/
Makefile
diff --git
a/test/Makefile
b/test/Makefile
index 59cd23e03b3878048ce47106ef11436c8a05ec5b..b6067c372fae438bb0f3e0dacfa6889f3790abfc 100644
(file)
--- a/
test/Makefile
+++ b/
test/Makefile
@@
-2,13
+2,13
@@
#
# The LLVM Compiler Infrastructure
#
#
# 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.
#
#===------------------------------------------------------------------------===#
#
#===------------------------------------------------------------------------===#
-LEVEL
= ..
-DIRS
=
+LEVEL = ..
+DIRS =
#
# Make Dejagnu the default for testing
#
# Make Dejagnu the default for testing
@@
-22,14
+22,30
@@
include Makefile.tests
# DejaGNU testing support
#===------------------------------------------------------------------------===#
# DejaGNU testing support
#===------------------------------------------------------------------------===#
+ifdef VERBOSE
+RUNTESTFLAGS := $(VERBOSE)
+endif
+
ifdef TESTSUITE
CLEANED_TESTSUITE := $(patsubst %/,%,$(TESTSUITE))
CLEANED_TESTSUITE := $(patsubst test/%,%,$(CLEANED_TESTSUITE))
ifdef TESTSUITE
CLEANED_TESTSUITE := $(patsubst %/,%,$(TESTSUITE))
CLEANED_TESTSUITE := $(patsubst test/%,%,$(CLEANED_TESTSUITE))
-RUNTESTFLAGS
:
= --tool $(CLEANED_TESTSUITE)
+RUNTESTFLAGS
+
= --tool $(CLEANED_TESTSUITE)
endif
endif
+ifdef VG
+VALGRIND := valgrind --tool=memcheck --quiet --trace-children=yes --error-exitcode=3 --leak-check=full
+endif
+
+IGNORE_TESTS :=
+
ifndef RUNLLVM2CPP
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),)
endif
ifneq ($(RUNTEST),)
@@
-39,7
+55,7
@@
check-local:: site.exp
$(RUNTEST) $(RUNTESTFLAGS) )
else
check-local:: site.exp
$(RUNTEST) $(RUNTESTFLAGS) )
else
check-local:: site.exp
- @echo "*** dejagnu not found. Make sure
runtest is in your PATH, then reconfigure llvm
."
+ @echo "*** dejagnu not found. Make sure
'runtest' is in your PATH, then reconfigure LLVM
."
endif
ifdef TESTONE
endif
ifdef TESTONE
@@
-54,6
+70,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 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 ; \
echo "source $(LLVM_SRC_ROOT)/test/lib/llvm.exp" ; \
echo "RunLLVMTests $(TESTPATH)" ) | \
( ulimit -t 600 ; ulimit -d 512000 ; \
@@
-64,7
+81,9
@@
endif
clean::
$(RM) -rf `find $(LLVM_OBJ_ROOT)/test -name Output -type d -print`
clean::
$(RM) -rf `find $(LLVM_OBJ_ROOT)/test -name Output -type d -print`
-site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
+FORCE:
+
+site.exp: FORCE
@echo 'Making a new site.exp file...'
@echo '## these variables are automatically generated by make ##' >site.tmp
@echo '# Do not edit here. If you wish to override these values' >>site.tmp
@echo 'Making a new site.exp file...'
@echo '## these variables are automatically generated by make ##' >site.tmp
@echo '# Do not edit here. If you wish to override these values' >>site.tmp
@@
-82,13
+101,17
@@
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 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) $(C
ompileCommonOpts) -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 link "$(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) $(LD.Flags)"' >>site.tmp
- @echo 'set llvmgcc "$(LLVMGCC)"' >> site.tmp
- @echo 'set llvmgxx "$(LLVMGCC)"' >> site.tmp
+ @echo 'set llvmgcc "$(LLVMGCC)
$(EXTRA_OPTIONS)
"' >> site.tmp
+ @echo 'set llvmgxx "$(LLVMGCC)
$(EXTRA_OPTIONS)
"' >> site.tmp
@echo 'set llvmgccmajvers "$(LLVMGCC_MAJVERS)"' >> site.tmp
@echo 'set shlibext "$(SHLIBEXT)"' >> 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 'set valgrind "$(VALGRIND)"' >> site.tmp
+ @echo 'set grep "$(GREP)"' >>site.tmp
+ @echo 'set gas "$(GAS)"' >>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
@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