summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authordmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-21 04:45:40 +0000
committerdmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-21 04:45:40 +0000
commite3f7ee7691d1673c53e672d1d6d8a5235dd8bc2a (patch)
tree773171bc35f083574e224ea4b3fc467c93d10247 /chrome
parent49118e80c3356b63d94ef95135baf135e6db90f8 (diff)
downloadchromium_src-e3f7ee7691d1673c53e672d1d6d8a5235dd8bc2a.zip
chromium_src-e3f7ee7691d1673c53e672d1d6d8a5235dd8bc2a.tar.gz
chromium_src-e3f7ee7691d1673c53e672d1d6d8a5235dd8bc2a.tar.bz2
Show only Deep Memory Profiler graphs for Debug builds in endure_result_parser.
BUG=122119,154240 Review URL: https://chromiumcodereview.appspot.com/11280043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168980 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rwxr-xr-xchrome/test/functional/perf/endure_result_parser.py21
1 files changed, 13 insertions, 8 deletions
diff --git a/chrome/test/functional/perf/endure_result_parser.py b/chrome/test/functional/perf/endure_result_parser.py
index 1336adb..3ca814f 100755
--- a/chrome/test/functional/perf/endure_result_parser.py
+++ b/chrome/test/functional/perf/endure_result_parser.py
@@ -223,7 +223,8 @@ def OutputEventData(revision, event_dict, dest_dir):
WriteToDataFile(new_line, existing_lines, revision, data_file)
-def UpdatePerfDataFromFetchedContent(revision, content, webapp_name, test_name):
+def UpdatePerfDataFromFetchedContent(revision, content, webapp_name, test_name,
+ only_dmp=False):
"""Update perf data from fetched stdio data.
Args:
@@ -231,6 +232,7 @@ def UpdatePerfDataFromFetchedContent(revision, content, webapp_name, test_name):
content: Fetched stdio data.
webapp_name: A name of the webapp.
test_name: A name of the test.
+ only_dmp: True if only Deep Memory Profiler results should be used.
"""
perf_data_raw = []
@@ -250,16 +252,18 @@ def UpdatePerfDataFromFetchedContent(revision, content, webapp_name, test_name):
# First scan for short-running perf test results.
for match in re.findall(
r'RESULT ([^:]+): ([^=]+)= ([-\d\.]+) (\S+)', content):
- AppendRawPerfData(match[0], match[1], eval(match[2]), match[3], None,
- webapp_name, webapp_name)
+ if (not only_dmp) or match[0].endswith('-DMP'):
+ AppendRawPerfData(match[0], match[1], eval(match[2]), match[3], None,
+ webapp_name, webapp_name)
# Next scan for long-running perf test results.
for match in re.findall(
r'RESULT ([^:]+): ([^=]+)= (\[[^\]]+\]) (\S+) (\S+)', content):
- # TODO(dmikurube): Change the condition to use stacked graph when we
- # determine how to specify it.
- AppendRawPerfData(match[0], match[1], eval(match[2]), match[3], match[4],
- webapp_name, test_name, match[0].endswith('-DMP'))
+ if (not only_dmp) or match[0].endswith('-DMP'):
+ # TODO(dmikurube): Change the condition to use stacked graph when we
+ # determine how to specify it.
+ AppendRawPerfData(match[0], match[1], eval(match[2]), match[3], match[4],
+ webapp_name, test_name, match[0].endswith('-DMP'))
# Next scan for events in the test results.
for match in re.findall(
@@ -415,7 +419,8 @@ def UpdatePerfDataForSlaveAndBuild(slave_info, build_num):
UpdatePerfDataFromFetchedContent(revision, url_contents,
stdio_url_data['webapp_name'],
- stdio_url_data['test_name'])
+ stdio_url_data['test_name'],
+ is_dbg)
return True