diff options
Diffstat (limited to 'tests/auto/testlib/selftests/skipcleanup')
4 files changed, 14 insertions, 63 deletions
diff --git a/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt deleted file mode 100644 index fba23174bd..0000000000 --- a/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -# Generated from skipcleanup.pro. - -##################################################################### -## skipcleanup Binary: -##################################################################### - -qt_add_executable(skipcleanup - SOURCES - tst_skipcleanup.cpp - PUBLIC_LIBRARIES - Qt::Test -) - -## Scopes: -##################################################################### diff --git a/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt b/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt index fd64c94d9e..36a643bf4d 100644 --- a/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt +++ b/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt @@ -1,21 +1,21 @@ -# Generated from skipcleanup.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## skipcleanup Binary: ##################################################################### -qt_add_executable(skipcleanup - NO_INSTALL # special case - OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case +qt_internal_add_executable(skipcleanup + NO_INSTALL + EXCEPTIONS + OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} SOURCES tst_skipcleanup.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Test ) ## Scopes: ##################################################################### -# special case begin -qt_apply_testlib_coverage_options(skipcleanup) -# special case end +qt_internal_apply_testlib_coverage_options(skipcleanup) diff --git a/tests/auto/testlib/selftests/skipcleanup/skipcleanup.pro b/tests/auto/testlib/selftests/skipcleanup/skipcleanup.pro deleted file mode 100644 index 059132b5a6..0000000000 --- a/tests/auto/testlib/selftests/skipcleanup/skipcleanup.pro +++ /dev/null @@ -1,9 +0,0 @@ -SOURCES += tst_skipcleanup.cpp -QT = core testlib - -mac:CONFIG -= app_bundle -CONFIG -= debug_and_release_target - -TARGET = skipcleanup - -include($$QT_SOURCE_TREE/src/testlib/selfcover.pri) diff --git a/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp b/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp index e51e85a19f..68053e4431 100644 --- a/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp +++ b/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp @@ -1,39 +1,14 @@ -/**************************************************************************** -** -** 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) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#include <QtTest/QtTest> +#include <QTest> class tst_SkipCleanup: public QObject { Q_OBJECT private slots: void aTestFunction() const; - void cleanupTestCase() const; + void cleanup() const; }; void tst_SkipCleanup::aTestFunction() const @@ -41,9 +16,9 @@ void tst_SkipCleanup::aTestFunction() const QVERIFY(true); } -void tst_SkipCleanup::cleanupTestCase() const +void tst_SkipCleanup::cleanup() const { - QSKIP("Skip inside cleanupTestCase."); + QSKIP("Skip inside cleanup."); } QTEST_APPLESS_MAIN(tst_SkipCleanup) |