diff options
Diffstat (limited to 'tests/auto/render/rhi')
11 files changed, 21 insertions, 59 deletions
diff --git a/tests/auto/render/rhi/rhi.pro b/tests/auto/render/rhi/rhi.pro deleted file mode 100644 index 9391c8ce0..000000000 --- a/tests/auto/render/rhi/rhi.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += \ - rhi_renderviews \ - rhi_rendercommands \ - rhi_graphicspipelinemanager diff --git a/tests/auto/render/rhi/rhi_graphicspipelinemanager/CMakeLists.txt b/tests/auto/render/rhi/rhi_graphicspipelinemanager/CMakeLists.txt index b9c27a8a5..a9fb75aba 100644 --- a/tests/auto/render/rhi/rhi_graphicspipelinemanager/CMakeLists.txt +++ b/tests/auto/render/rhi/rhi_graphicspipelinemanager/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_rhi_graphicspipelinemanager Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_rhi_graphicspipelinemanager LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_rhi_graphicspipelinemanager SOURCES tst_rhi_graphicspipelinemanager.cpp diff --git a/tests/auto/render/rhi/rhi_graphicspipelinemanager/rhi_graphicspipelinemanager.pro b/tests/auto/render/rhi/rhi_graphicspipelinemanager/rhi_graphicspipelinemanager.pro deleted file mode 100644 index 33d26fed8..000000000 --- a/tests/auto/render/rhi/rhi_graphicspipelinemanager/rhi_graphicspipelinemanager.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app - -TARGET = tst_rhi_rendercommands - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_rhi_rendercommands.cpp - -include(../../../core/common/common.pri) -include(../../commons/commons.pri) - -# Link Against RHI Renderer Plugin -include(../rhi_render_plugin.pri) diff --git a/tests/auto/render/rhi/rhi_graphicspipelinemanager/tst_rhi_graphicspipelinemanager.cpp b/tests/auto/render/rhi/rhi_graphicspipelinemanager/tst_rhi_graphicspipelinemanager.cpp index 66bc48f3b..ce83fcaeb 100644 --- a/tests/auto/render/rhi/rhi_graphicspipelinemanager/tst_rhi_graphicspipelinemanager.cpp +++ b/tests/auto/render/rhi/rhi_graphicspipelinemanager/tst_rhi_graphicspipelinemanager.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <qbackendnodetester.h> diff --git a/tests/auto/render/rhi/rhi_render_plugin.pri b/tests/auto/render/rhi/rhi_render_plugin.pri deleted file mode 100644 index 0e55ef886..000000000 --- a/tests/auto/render/rhi/rhi_render_plugin.pri +++ /dev/null @@ -1,5 +0,0 @@ -# Found no way of having the test runner include the correct -# library path as runtime - -# Instead we link against the sources directly -include(../../../../src/plugins/renderers/rhi/rhi.pri) diff --git a/tests/auto/render/rhi/rhi_rendercommands/CMakeLists.txt b/tests/auto/render/rhi/rhi_rendercommands/CMakeLists.txt index 586814525..6a4a424c4 100644 --- a/tests/auto/render/rhi/rhi_rendercommands/CMakeLists.txt +++ b/tests/auto/render/rhi/rhi_rendercommands/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_rhi_rendercommands Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_rhi_rendercommands LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_rhi_rendercommands SOURCES tst_rhi_rendercommands.cpp diff --git a/tests/auto/render/rhi/rhi_rendercommands/rhi_rendercommands.pro b/tests/auto/render/rhi/rhi_rendercommands/rhi_rendercommands.pro deleted file mode 100644 index 33d26fed8..000000000 --- a/tests/auto/render/rhi/rhi_rendercommands/rhi_rendercommands.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app - -TARGET = tst_rhi_rendercommands - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_rhi_rendercommands.cpp - -include(../../../core/common/common.pri) -include(../../commons/commons.pri) - -# Link Against RHI Renderer Plugin -include(../rhi_render_plugin.pri) diff --git a/tests/auto/render/rhi/rhi_rendercommands/tst_rhi_rendercommands.cpp b/tests/auto/render/rhi/rhi_rendercommands/tst_rhi_rendercommands.cpp index 1dda4411d..7e93d0514 100644 --- a/tests/auto/render/rhi/rhi_rendercommands/tst_rhi_rendercommands.cpp +++ b/tests/auto/render/rhi/rhi_rendercommands/tst_rhi_rendercommands.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <qbackendnodetester.h> diff --git a/tests/auto/render/rhi/rhi_renderviews/CMakeLists.txt b/tests/auto/render/rhi/rhi_renderviews/CMakeLists.txt index d17f0260d..e6d2e8f72 100644 --- a/tests/auto/render/rhi/rhi_renderviews/CMakeLists.txt +++ b/tests/auto/render/rhi/rhi_renderviews/CMakeLists.txt @@ -7,6 +7,12 @@ ## tst_rhi_renderviews Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_rhi_renderviews LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_rhi_renderviews SOURCES tst_rhi_renderviews.cpp diff --git a/tests/auto/render/rhi/rhi_renderviews/rhi_renderviews.pro b/tests/auto/render/rhi/rhi_renderviews/rhi_renderviews.pro deleted file mode 100644 index 5f5d749f5..000000000 --- a/tests/auto/render/rhi/rhi_renderviews/rhi_renderviews.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app - -TARGET = tst_rhi_renderviews - -QT += 3dcore 3dcore-private 3drender 3drender-private testlib - -CONFIG += testcase - -SOURCES += tst_rhi_renderviews.cpp - -include(../../../core/common/common.pri) -include(../../commons/commons.pri) - -# Link Against RHI Renderer Plugin -include(../rhi_render_plugin.pri) diff --git a/tests/auto/render/rhi/rhi_renderviews/tst_rhi_renderviews.cpp b/tests/auto/render/rhi/rhi_renderviews/tst_rhi_renderviews.cpp index 6ea5781bf..788492d99 100644 --- a/tests/auto/render/rhi/rhi_renderviews/tst_rhi_renderviews.cpp +++ b/tests/auto/render/rhi/rhi_renderviews/tst_rhi_renderviews.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <qbackendnodetester.h> |