diff options
| author | pasko@chromium.org <pasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-12 18:21:02 +0000 |
|---|---|---|
| committer | pasko@chromium.org <pasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-12 18:21:02 +0000 |
| commit | 9a065829eb38d8f47482d353368c244a67729618 (patch) | |
| tree | 0cbe4780950876422f5e6887ebd48d6801178fed /tools/android | |
| parent | b17f85b688f5f080373f59d855e6743418497234 (diff) | |
| download | chromium_src-9a065829eb38d8f47482d353368c244a67729618.zip chromium_src-9a065829eb38d8f47482d353368c244a67729618.tar.gz chromium_src-9a065829eb38d8f47482d353368c244a67729618.tar.bz2 | |
memreport.py: Strip EOL from memdump output
This allows redirecting adb shell output directly to memreport.py without having
to do dos2unix, and be able to match end of line in regexps.
BUG=none
Review URL: https://chromiumcodereview.appspot.com/16661004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205875 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/android')
| -rwxr-xr-x | tools/android/memdump/memreport.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/android/memdump/memreport.py b/tools/android/memdump/memreport.py index d0c6fce..62b3ac4 100755 --- a/tools/android/memdump/memreport.py +++ b/tools/android/memdump/memreport.py @@ -47,7 +47,7 @@ def _CollectMemoryStats(memdump, region_filters): continue matched_regions = Set([]) for region_filter in region_filters: - if regexps[region_filter].match(line): + if regexps[region_filter].match(line.rstrip('\r\n')): matched_regions.add(region_filter) if not region_filter in mem_usage_for_regions: mem_usage_for_regions[region_filter] = { |