From 34fb24d5a9a4eb72bd96a861046a7c48672c2421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sun, 17 Dec 2023 20:04:17 +0100 Subject: [PATCH] tools/extracttests.py: test code was not extracted properly for some tests (#5776) --- tools/extracttests.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/extracttests.py b/tools/extracttests.py index 42a80d6c0..a45c8261d 100755 --- a/tools/extracttests.py +++ b/tools/extracttests.py @@ -94,8 +94,7 @@ class Extract: start_code = None disable = False - fin = open(filename, 'r') - for line in fin: + for line in open(filename, 'r'): # testclass starts res = re.match('class (' + name + ')', line) if res is not None: @@ -137,6 +136,10 @@ class Extract: if code is not None: res = re.match('\\s+' + string, line) if res is not None: + if line.find('",') > line.find('"'): + code = None + continue + code = code + res.group(1) if res.group(1).find('"') > 0: code = None @@ -159,10 +162,8 @@ class Extract: 'expected': expected} self.nodes.append(node) code = None - - # close test file - fin.close() - + elif re.match('\\s+[TOD_]*ASSERT', line) is not None: + code = None def strtoxml(s): """Convert string to xml/html format"""