diff options
Diffstat (limited to 'tests/auto/testlib/selftests/benchlibtickcounter')
4 files changed, 12 insertions, 65 deletions
diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt deleted file mode 100644 index e2f83a540c..0000000000 --- a/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -# Generated from benchlibtickcounter.pro. - -##################################################################### -## benchlibtickcounter Binary: -##################################################################### - -qt_internal_add_executable(benchlibtickcounter - SOURCES - tst_benchlibtickcounter.cpp - PUBLIC_LIBRARIES - Qt::TestPrivate -) - -## Scopes: -##################################################################### diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt index 463a74eaf7..639e75c8bb 100644 --- a/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt @@ -1,21 +1,21 @@ -# Generated from benchlibtickcounter.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## benchlibtickcounter Binary: ##################################################################### qt_internal_add_executable(benchlibtickcounter - NO_INSTALL # special case - OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case + NO_INSTALL + EXCEPTIONS + OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} SOURCES tst_benchlibtickcounter.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::TestPrivate ) ## Scopes: ##################################################################### -# special case begin qt_internal_apply_testlib_coverage_options(benchlibtickcounter) -# special case end diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/benchlibtickcounter.pro b/tests/auto/testlib/selftests/benchlibtickcounter/benchlibtickcounter.pro deleted file mode 100644 index f0741d5c26..0000000000 --- a/tests/auto/testlib/selftests/benchlibtickcounter/benchlibtickcounter.pro +++ /dev/null @@ -1,10 +0,0 @@ -SOURCES += tst_benchlibtickcounter.cpp -QT = core testlib-private - -mac:CONFIG -= app_bundle -CONFIG -= debug_and_release_target - - -TARGET = benchlibtickcounter - -include($$QT_SOURCE_TREE/src/testlib/selfcover.pri) diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp b/tests/auto/testlib/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp index 2cb7dfd77f..204a28599e 100644 --- a/tests/auto/testlib/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp +++ b/tests/auto/testlib/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp @@ -1,34 +1,9 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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 <QtTest/QtTest> +#include <QTest> #include <private/cycle_p.h> @@ -62,14 +37,11 @@ void tst_BenchlibTickCounter::threeBillionTicks() #endif } -int main(int argc, char *argv[]) -{ +QTEST_MAIN_WRAPPER(tst_BenchlibTickCounter, std::vector<const char*> args(argv, argv + argc); args.push_back("-tickcounter"); - argc = args.size(); + argc = int(args.size()); argv = const_cast<char**>(&args[0]); - - QTEST_MAIN_IMPL(tst_BenchlibTickCounter) -} + QTEST_MAIN_SETUP()) #include "tst_benchlibtickcounter.moc" |