aboutsummaryrefslogtreecommitdiffstats
path: root/testing/blacklist.py
diff options
context:
space:
mode:
Diffstat (limited to 'testing/blacklist.py')
-rw-r--r--testing/blacklist.py68
1 files changed, 19 insertions, 49 deletions
diff --git a/testing/blacklist.py b/testing/blacklist.py
index c0a5e233d..eacb51cbb 100644
--- a/testing/blacklist.py
+++ b/testing/blacklist.py
@@ -1,51 +1,23 @@
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of Qt for Python.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 3 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL3 included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 3 requirements
-## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 2.0 or (at your option) the GNU General
-## Public license version 3 or any later version approved by the KDE Free
-## Qt Foundation. The licenses are as published by the Free Software
-## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-2.0.html and
-## https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-from __future__ import print_function
+"""
+testing/blacklist.py
+
+Take a blacklist file and build classifiers for all tests.
+
+find_matching_line() adds info using classifiers.
+"""
+
+from io import StringIO
-from .helper import decorate, StringIO
from .buildlog import builds
+from .helper import decorate
class BlackList(object):
def __init__(self, blname):
- if blname == None:
+ if not blname:
f = StringIO()
self.raw_data = []
else:
@@ -55,8 +27,8 @@ class BlackList(object):
lines = self.raw_data[:]
def filtered_line(line):
- if '#' in line:
- line = line[0:line.index('#')]
+ if "#" in line:
+ line = line[:line.index("#")]
return line.split()
# now put every bracketed line in a test
@@ -70,7 +42,6 @@ class BlackList(object):
# nothing supplied
return
- self.index = {}
for idx, line in enumerate(lines):
fline = filtered_line(line)
if not fline:
@@ -78,15 +49,15 @@ class BlackList(object):
if is_test(fline):
break
# we have a global section
- name = ''
+ name = ""
self.tests[name] = []
for idx, line in enumerate(lines):
fline = filtered_line(line)
if is_test(fline):
# a new name
name = decorate(fline[0][1:-1])
- self.tests[name] = []
- self.index[name] = idx
+ # Allow for repeated sections
+ self.tests.setdefault(name, [])
elif fline:
# a known name with a new entry
self.tests[name].append(fline)
@@ -99,7 +70,6 @@ class BlackList(object):
if line found and test passed, it is a BPASS.
If line found and test failed, it is a BFAIL.
"""
- passed = test.passed
classifiers = set(builds.classifiers)
if "" in self.tests:
@@ -122,4 +92,4 @@ class BlackList(object):
# found a match!
return line
else:
- return None # nothing found
+ return None # nothing found