summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authordank@chromium.org <dank@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-20 04:08:45 +0000
committerdank@chromium.org <dank@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-20 04:08:45 +0000
commitbec743fef48c1053ff6397f141e2b34519854f98 (patch)
tree0ca9550f7242e79039df1ca5e11aeacbe3b515f4 /tools
parent0db8cf7363ceb76a33a0f10a481fb0e1e695c7da (diff)
downloadchromium_src-bec743fef48c1053ff6397f141e2b34519854f98.zip
chromium_src-bec743fef48c1053ff6397f141e2b34519854f98.tar.gz
chromium_src-bec743fef48c1053ff6397f141e2b34519854f98.tar.bz2
Wait for valgrind to finish (the python script already does this, just forgot)
Review URL: http://codereview.chromium.org/159065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21068 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r--tools/valgrind/valgrind_webkit_tests.sh15
1 files changed, 14 insertions, 1 deletions
diff --git a/tools/valgrind/valgrind_webkit_tests.sh b/tools/valgrind/valgrind_webkit_tests.sh
index 88df289..f8c1299 100644
--- a/tools/valgrind/valgrind_webkit_tests.sh
+++ b/tools/valgrind/valgrind_webkit_tests.sh
@@ -11,7 +11,7 @@
cat > vlayout-wrapper.sh <<"_EOF_"
#!/bin/sh
-valgrind --suppressions=tools/valgrind/memcheck/suppressions.txt --tool=memcheck --smc-check=all --num-callers=30 --trace-children=yes --leak-check=full --log-file=vlayout-%p.log "$@"
+valgrind --suppressions=tools/valgrind/memcheck/suppressions.txt --tool=memcheck --smc-check=all --num-callers=30 --trace-children=yes --leak-check=full --log-file=vlayout-%p.log --gen-suppressions=all --track-origins=yes "$@"
_EOF_
chmod +x vlayout-wrapper.sh
@@ -20,4 +20,17 @@ export BROWSER_WRAPPER=`pwd`/vlayout-wrapper.sh
export G_SLICE=always-malloc
export NSS_DISABLE_ARENA_FREE_LIST=1
sh webkit/tools/layout_tests/run_webkit_tests.sh --run-singly -v --noshow-results --time-out-ms=200000 --nocheck-sys-deps --debug "$@"
+
+# Have to wait a bit for the output files to finish
+nfiles=`ls vlayout-*.log | wc -l`
+while true
+do
+ ndone=`grep -l "LEAK SUMMARY" vlayout-*.log | wc -l`
+ if test $nfiles = $ndone
+ then
+ break
+ fi
+ echo "Waiting for valgrind to finish..."
+ sleep 1
+done
cat vlayout-*.log