maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

restore proper valgrind support. 

disclaim: I know nothing about Python, so apologies in advance if I break something

llvm-svn: 75368
This commit is contained in:
Nuno Lopes 2009-07-11 18:34:43 +00:00
parent 594006524b
commit 14ea24e422
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/test/Makefile
View File

@ -12,9 +12,15 @@ TESTARGS = -s
endif
endif
ifdef VG
VGARG="--vg"
else
VGARG=
endif
all::
@ echo '--- Running clang tests for $(TARGET_TRIPLE) ---'
@ PATH=$(ToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$$PATH VG=$(VG) $(PROJ_SRC_DIR)/../utils/test/MultiTestRunner.py $(TESTARGS) $(TESTDIRS)
@ PATH=$(ToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$$PATH $(PROJ_SRC_DIR)/../utils/test/MultiTestRunner.py $(TESTARGS) $(TESTDIRS) $(VGARG)
clean::
@ rm -rf Output/

14
clang/utils/test/TestRunner.py
View File

@ -71,11 +71,13 @@ def runOneTest(FILENAME, SUBST, OUTPUT, TESTNAME, CLANG, CLANGCC,
useDGCompat=False,
useScript=None,
output=sys.stdout):
OUTPUT = os.path.abspath(OUTPUT)
if useValgrind:
VG_OUTPUT = '%s.vg'%(OUTPUT,)
if os.path.exists:
remove(VG_OUTPUT)
CLANG = 'valgrind --leak-check=full --quiet --log-file=%s %s'%(VG_OUTPUT, CLANG)
os.system('rm -f %s.*'%(VG_OUTPUT))
VALGRIND = 'valgrind -q --tool=memcheck --leak-check=full --trace-children=yes --log-file=%s.%%p'%(VG_OUTPUT)
CLANG = '%s %s'%(VALGRIND, CLANG)
CLANGCC = '%s %s'%(VALGRIND, CLANGCC)
# Create the output directory if it does not already exist.
mkdir_p(os.path.dirname(OUTPUT))
@ -105,7 +107,6 @@ def runOneTest(FILENAME, SUBST, OUTPUT, TESTNAME, CLANG, CLANGCC,
output.flush()
return TestStatus.NoRunLine
OUTPUT = os.path.abspath(OUTPUT)
FILENAME = os.path.abspath(FILENAME)
SCRIPT = OUTPUT + '.script'
TEMPOUTPUT = OUTPUT + '.tmp'
@ -168,7 +169,8 @@ def runOneTest(FILENAME, SUBST, OUTPUT, TESTNAME, CLANG, CLANGCC,
SCRIPT_STATUS = not SCRIPT_STATUS
if useValgrind:
VG_STATUS = len(list(open(VG_OUTPUT)))
VG_OUTPUT = capture(['/bin/sh','-c','cat %s.*'%(VG_OUTPUT)])
VG_STATUS = len(VG_OUTPUT)
else:
VG_STATUS = 0
@ -183,7 +185,7 @@ def runOneTest(FILENAME, SUBST, OUTPUT, TESTNAME, CLANG, CLANGCC,
cat(OUTPUT, output)
if VG_STATUS:
print >>output, "Valgrind Output:"
cat(VG_OUTPUT, output)
print >>output, VG_OUTPUT
print >>output, "******************** TEST '%s' FAILED! ********************"%(TESTNAME,)
output.flush()
if xfailLines: