diff options
author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2017-05-04 14:49:57 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-05 22:39:47 +0000 |
commit | b9d63e19a978278647f6a6563d081c5a8ab70deb (patch) | |
tree | cbfde114cdcb59bb09d51830473ae35fec57e9da | |
parent | 24be54c87c1ac3bbc9958cb18bc846a2422d2694 (diff) | |
download | poky-b9d63e19a978278647f6a6563d081c5a8ab70deb.tar.gz |
oe-build-perf-report: accept parenthesis in tag names
(From OE-Core rev: b1feae0e23300ea3894d14d2e7b1c1f8b419146e)
(From OE-Core rev: f2a7a52b7a0915bd9905b3244b7b0deb6795205d)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | scripts/oe-build-perf-report | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/oe-build-perf-report b/scripts/oe-build-perf-report index ced5ff2e12..876e3b1a76 100755 --- a/scripts/oe-build-perf-report +++ b/scripts/oe-build-perf-report | |||
@@ -62,11 +62,13 @@ def get_test_runs(repo, tag_name, **kwargs): | |||
62 | log.debug("Found %d tags matching pattern '%s'", len(tags), tag_pattern) | 62 | log.debug("Found %d tags matching pattern '%s'", len(tags), tag_pattern) |
63 | 63 | ||
64 | # Parse undefined fields from tag names | 64 | # Parse undefined fields from tag names |
65 | str_fields = dict([(f, r'(?P<{}>[\w\-.]+)'.format(f)) for f in field_names]) | 65 | str_fields = dict([(f, r'(?P<{}>[\w\-.()]+)'.format(f)) for f in field_names]) |
66 | str_fields['commit'] = '(?P<commit>[0-9a-f]{7,40})' | 66 | str_fields['commit'] = '(?P<commit>[0-9a-f]{7,40})' |
67 | str_fields['commit_number'] = '(?P<commit_number>[0-9]{1,7})' | 67 | str_fields['commit_number'] = '(?P<commit_number>[0-9]{1,7})' |
68 | str_fields['tag_number'] = '(?P<tag_number>[0-9]{1,5})' | 68 | str_fields['tag_number'] = '(?P<tag_number>[0-9]{1,5})' |
69 | str_fields.update(kwargs) | 69 | # escape parenthesis in fields in order to not messa up the regexp |
70 | fixed_fields = dict([(k, v.replace('(', r'\(').replace(')', r'\)')) for k, v in kwargs.items()]) | ||
71 | str_fields.update(fixed_fields) | ||
70 | tag_re = re.compile(tag_name.format(**str_fields)) | 72 | tag_re = re.compile(tag_name.format(**str_fields)) |
71 | 73 | ||
72 | # Parse fields from tags | 74 | # Parse fields from tags |