summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorerikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-05 18:37:42 +0000
committererikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-05 18:37:42 +0000
commitefd3f9e1abc7eb615492cb9ee4c1e9b13fbb25cb (patch)
treeff286e631e0f7566c1a9bf6dc7fba55f1dcfd643 /tools
parent7f0ebc9a390a168a412c4b4a217761d7d72d4b25 (diff)
downloadchromium_src-efd3f9e1abc7eb615492cb9ee4c1e9b13fbb25cb.zip
chromium_src-efd3f9e1abc7eb615492cb9ee4c1e9b13fbb25cb.tar.gz
chromium_src-efd3f9e1abc7eb615492cb9ee4c1e9b13fbb25cb.tar.bz2
A few minor tweaks to Purify options that should allow us to enable a few tests that were previously disabled as well as dealing with a few occasional hangs and crashes.
Review URL: http://codereview.chromium.org/23006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9228 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r--tools/purify/common.py3
-rw-r--r--tools/purify/purify_test.py16
2 files changed, 16 insertions, 3 deletions
diff --git a/tools/purify/common.py b/tools/purify/common.py
index a684bb6..d384514 100644
--- a/tools/purify/common.py
+++ b/tools/purify/common.py
@@ -52,8 +52,7 @@ class TimeoutError(Exception): pass
def _print_line(line, flush=True):
# Printing to a text file (including stdout) on Windows always winds up
# using \r\n automatically. On buildbot, this winds up being read by a master
- # running on Linux, so this is a pain. Unfortunately, it doesn't matter what
- # we do here, so just leave this comment for future reference.
+ # running on Linux, so we manually convert crlf to '\n'
print line.rstrip() + '\n',
if flush:
sys.stdout.flush()
diff --git a/tools/purify/purify_test.py b/tools/purify/purify_test.py
index 2d8f48a..c4798cef 100644
--- a/tools/purify/purify_test.py
+++ b/tools/purify/purify_test.py
@@ -100,11 +100,25 @@ class Purify(common.Rational):
"[Purify]",
"option -cache-dir=\"%s\"" % (self._cache_dir),
"option -save-text-data=\"%s\"" % (common.FixPath(self._out_file)),
+ # Change the recorded stack depth to be much larger than the default.
+ # (webkit/v8 stacks in particular seem to get quite deep)
"option -alloc-call-stack-length=30",
"option -error-call-stack-length=30",
"option -free-call-stack-length=30",
+ # Report leaks.
"option -leaks-at-exit=yes",
- "option -in-use-at-exit=no"
+ # Don't report memory in use (that's for memory profiling).
+ "option -in-use-at-exit=no",
+ # The maximum number of subprocesses. If this is exceeded, Purify
+ # seems to lose its mind, and we have a number of tests that use
+ # much larger than the default of 5.
+ "option -number-of-puts=30",
+ # With our large pdbs, purify's default timeout (30) isn't always
+ # enough. If this isn't enough, -1 means no timeout.
+ "option -server-comm-timeout=120",
+ # check stack memory loads for UMRs, etc.
+ # currently disabled due to noisiness (see bug 5189)
+ #"option -stack-load-checking=yes",
]
ini_file = self._exe.replace(".exe", "_pure.ini")
if os.path.isfile(ini_file):