summaryrefslogtreecommitdiffstats
path: root/tests/auto/testlib/selftests/commandlinedata
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/testlib/selftests/commandlinedata')
-rw-r--r--tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt15
-rw-r--r--tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt16
-rw-r--r--tests/auto/testlib/selftests/commandlinedata/commandlinedata.pro9
-rw-r--r--tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp40
4 files changed, 14 insertions, 66 deletions
diff --git a/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt
deleted file mode 100644
index 2f08f35c03..0000000000
--- a/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# Generated from commandlinedata.pro.
-
-#####################################################################
-## commandlinedata Binary:
-#####################################################################
-
-qt_add_executable(commandlinedata
- SOURCES
- tst_commandlinedata.cpp
- PUBLIC_LIBRARIES
- Qt::Test
-)
-
-## Scopes:
-#####################################################################
diff --git a/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt b/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt
index 889ef5377f..c563f9919a 100644
--- a/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt
@@ -1,21 +1,21 @@
-# Generated from commandlinedata.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## commandlinedata Binary:
#####################################################################
-qt_add_executable(commandlinedata
- NO_INSTALL # special case
- OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+qt_internal_add_executable(commandlinedata
+ NO_INSTALL
+ EXCEPTIONS
+ OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
SOURCES
tst_commandlinedata.cpp
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Test
)
## Scopes:
#####################################################################
-# special case begin
-qt_apply_testlib_coverage_options(commandlinedata)
-# special case end
+qt_internal_apply_testlib_coverage_options(commandlinedata)
diff --git a/tests/auto/testlib/selftests/commandlinedata/commandlinedata.pro b/tests/auto/testlib/selftests/commandlinedata/commandlinedata.pro
deleted file mode 100644
index 8032ba5a02..0000000000
--- a/tests/auto/testlib/selftests/commandlinedata/commandlinedata.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-SOURCES += tst_commandlinedata.cpp
-QT = core testlib
-
-mac:CONFIG -= app_bundle
-CONFIG -= debug_and_release_target
-
-TARGET = commandlinedata
-
-include($$QT_SOURCE_TREE/src/testlib/selfcover.pri)
diff --git a/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp b/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp
index a916fd7f1e..c895ae4ed8 100644
--- a/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp
+++ b/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.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>
/*!
\internal
@@ -63,16 +38,13 @@ void tst_DataTable::fiveTablePasses_data() const
QTest::newRow("fiveTablePasses_data5") << true;
}
-int main(int argc, char *argv[])
-{
+QTEST_MAIN_WRAPPER(tst_DataTable,
std::vector<const char*> args(argv, argv + argc);
args.push_back("fiveTablePasses");
args.push_back("fiveTablePasses:fiveTablePasses_data1");
args.push_back("-v2");
- argc = args.size();
+ argc = int(args.size());
argv = const_cast<char**>(&args[0]);
-
- QTEST_MAIN_IMPL(tst_DataTable)
-}
+ QTEST_MAIN_SETUP())
#include "tst_commandlinedata.moc"