From cd76d677faa1e988b68627919d479752a835efdf Mon Sep 17 00:00:00 2001 From: Christian Tismer Date: Thu, 30 Nov 2017 05:01:03 +0100 Subject: Fix testrunner to parse blacklist correctly on Qt5.xx.y testrunner had a simple extension that propagated classifiers like Qt5.6.4 to Qt5.6 and Qt5. This extension was not able to recognize Qt5.11.0 . It was a known omission in testrunner.py that was commented but ignored in the reviews. (#35 on 2016-09-16 and #42 on 2016-09-22) This patch corrects that omission. Change-Id: I0b17c40b46af0572123a503a83db115b488bb87a Reviewed-by: Friedemann Kleint --- testrunner.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'testrunner.py') diff --git a/testrunner.py b/testrunner.py index 2206e4f51..acf4e407b 100644 --- a/testrunner.py +++ b/testrunner.py @@ -161,21 +161,13 @@ class BuildLog(object): path = self.selected.build_dir base = os.path.basename(path) res.extend(base.split('-')) - # add the python version py2 and py3 - # also add the keys qt5 and qt5.6 etc. + # add all the python and qt subkeys for entry in res: - if entry.startswith("py"): - key = entry[:3] + parts = entry.split(".") + for idx in range(len(parts)): + key = ".".join(parts[:idx]) if key not in res: res.append(key) - if entry.startswith("qt"): - key = entry[:3] - if key not in res: - res.append(key) - key = entry[:5] - if key not in res: - res.append(key) - # this will become more difficult when the version has two digits return res -- cgit v1.2.3