diff options
Diffstat (limited to 'testing/blacklist.py')
-rw-r--r-- | testing/blacklist.py | 50 |
1 files changed, 7 insertions, 43 deletions
diff --git a/testing/blacklist.py b/testing/blacklist.py index 09848dce4..eacb51cbb 100644 --- a/testing/blacklist.py +++ b/testing/blacklist.py @@ -1,41 +1,5 @@ -############################################################################# -## -## 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 """ testing/blacklist.py @@ -46,8 +10,9 @@ find_matching_line() adds info using classifiers. """ from io import StringIO -from .helper import decorate + from .buildlog import builds +from .helper import decorate class BlackList(object): @@ -63,7 +28,7 @@ class BlackList(object): def filtered_line(line): if "#" in line: - line = line[line.index("#")] + line = line[:line.index("#")] return line.split() # now put every bracketed line in a test @@ -77,7 +42,6 @@ class BlackList(object): # nothing supplied return - self.index = {} for idx, line in enumerate(lines): fline = filtered_line(line) if not fline: @@ -92,8 +56,8 @@ class BlackList(object): 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) |