diff options
Diffstat (limited to 'tests/auto/testlib/selftests/counting/tst_counting.cpp')
| -rw-r--r-- | tests/auto/testlib/selftests/counting/tst_counting.cpp | 46 |
1 files changed, 12 insertions, 34 deletions
diff --git a/tests/auto/testlib/selftests/counting/tst_counting.cpp b/tests/auto/testlib/selftests/counting/tst_counting.cpp index 0831f88005..d521ea0238 100644 --- a/tests/auto/testlib/selftests/counting/tst_counting.cpp +++ b/tests/auto/testlib/selftests/counting/tst_counting.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtCore/QCoreApplication> #include <QTest> @@ -290,15 +265,18 @@ void tst_Counting::testSkipInCleanup() qDebug() << "This test function should execute and then QSKIP in cleanup()"; } -int main(int argc, char *argv[]) -{ #ifdef TESTLIB_VERBOSITY_ARG - std::vector<const char*> args(argv, argv + argc); - args.push_back(QT_STRINGIFY(TESTLIB_VERBOSITY_ARG)); - argc = int(args.size()); +#define SETUP() \ + std::vector<const char*> args(argv, argv + argc); \ + args.push_back(QT_STRINGIFY(TESTLIB_VERBOSITY_ARG)); \ + argc = int(args.size()); \ argv = const_cast<char**>(&args[0]); +#else +#define SETUP() #endif - QTEST_MAIN_IMPL(tst_Counting) -} +QTEST_MAIN_WRAPPER(tst_Counting, + SETUP() + QTEST_MAIN_SETUP()) + #include "tst_counting.moc" |