From e657a25df7d792dcc597a0ac018470b049ad6049 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Tue, 13 Aug 2013 15:12:33 +0000 Subject: [PATCH] bench_util: allow optional whitespace in CSV format BUG=https://code.google.com/p/skia/issues/detail?id=1500 R=bensong@google.com Review URL: https://codereview.chromium.org/23069003 git-svn-id: http://skia.googlecode.com/svn/trunk@10692 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench/bench_util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bench/bench_util.py b/bench/bench_util.py index b959d32..f2603f9 100644 --- a/bench/bench_util.py +++ b/bench/bench_util.py @@ -17,7 +17,7 @@ ALGORITHM_25TH_PERCENTILE = '25th' PER_SETTING_RE = '([^\s=]+)(?:=(\S+))?' SETTINGS_RE = 'skia bench:((?:\s+' + PER_SETTING_RE + ')*)' BENCH_RE = 'running bench (?:\[\d+ \d+\] )?\s*(\S+)' -TIME_RE = '(?:(\w*)msecs = )?\s*((?:\d+\.\d+)(?:, \d+\.\d+)*)' +TIME_RE = '(?:(\w*)msecs = )?\s*((?:\d+\.\d+)(?:,\s*\d+\.\d+)*)' # non-per-tile benches have configs that don't end with ']' or '>' CONFIG_RE = '(\S+[^\]>]): ((?:' + TIME_RE + '\s+)+)' # per-tile bench lines are in the following format. Note that there are -- 2.7.4