test-bugzilla-files/analyze_logs.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit e7f118825589042662c9efc68bd9a5553b5f0e8d
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Aug 15 14:57:06 2022 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Aug 15 16:01:29 2022 +0200
update log processing for new subdirs
Change-Id: I248e9a63760ed607b9f9df5d0a6c8ed20fdac860
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/138315
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/test-bugzilla-files/analyze_logs.py
b/test-bugzilla-files/analyze_logs.py
index c2c426a..f027dc1 100644
--- a/test-bugzilla-files/analyze_logs.py
+++ b/test-bugzilla-files/analyze_logs.py
@@ -26,7 +26,7 @@ def analyze_import_crash(crashtest_file, crashes):
if not os.path.exists(crashtest_file):
return 0
- regex = re.compile("Crash:/srv/crashtestdata/files/(\w*)")
+ regex = re.compile("Crash:/srv/crashtestdata/.+/(\w*)/")
for line in open(crashtest_file):
r = regex.search(line)
format = r.groups()[0]
@@ -39,9 +39,11 @@ def analyze_odfundifflog(odfundifflog_file, differences):
if not os.path.exists(odfundifflog_file):
return 0
- regex = re.compile("Difference in :/srv/crashtestdata/files/(\w*)")
+ regex = re.compile("/srv/crashtestdata/.+/(\w*)/")
for line in open(odfundifflog_file):
r = regex.search(line)
+ if r == None:
+ continue
format = r.groups()[0]
if format not in differences:
differences[format] = 0
@@ -52,7 +54,7 @@ def analyze_export_crash(crashtest_file, crashes):
if not os.path.exists(crashtest_file):
return 0
- regex = re.compile("/srv/crashtestdata/files/\w+/[a-zA-Z0-9_-]+\.(\w+)")
+ regex = re.compile("/srv/crashtestdata/files/.+/[,:a-zA-Z0-9_-]+\.(\w+)")
for line in open(crashtest_file):
r = regex.search(line)
format = r.groups()[0]
