Qbs build system: Add a component for test files groups

Mainly in order to enforce a unified group name across QtC libraries and plugins. Change-Id: I6eafe0f9d227ec73d8c9029675866c67063768fb Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-03-21 10:01:28 +01:00
parent 1029cb959b
commit 50a214de9e
24 changed files with 29 additions and 68 deletions
--- a/qbs/imports/QtcTestFiles.qbs
+++ b/qbs/imports/QtcTestFiles.qbs
@@ -0,0 +1,6 @@
+import qbs 1.0
+
+Group {
+    name: "Unit tests"
+    condition: qtc.testsEnabled
+}
--- a/src/plugins/android/android.qbs
+++ b/src/plugins/android/android.qbs
@@ -116,9 +116,7 @@ Project {
            "sdkmanageroutputparser.h"
        ]

-        Group {
-            name: "Unit tests"
-            condition: qtc.testsEnabled
+        QtcTestFiles {
            files: [
                "android_tst.qrc",
                "androidsdkmanager_test.cpp",
--- a/src/plugins/autotest/autotest.qbs
+++ b/src/plugins/autotest/autotest.qbs
@@ -125,9 +125,7 @@ QtcPlugin {
        ]
    }

-    Group {
-        name: "Test sources"
-        condition: qtc.testsEnabled
+    QtcTestFiles {
        files: [
            "autotestunittests.cpp",
            "autotestunittests.h",
--- a/src/plugins/clangcodemodel/clangcodemodel.qbs
+++ b/src/plugins/clangcodemodel/clangcodemodel.qbs
@@ -94,9 +94,7 @@ QtcPlugin {
        }
    }

-    Group {
-        name: "Tests"
-        condition: qtc.testsEnabled
+    QtcTestFiles {
        prefix: "test/"
        files: [
            "activationsequenceprocessortest.cpp",
--- a/src/plugins/clangformat/clangformat.qbs
+++ b/src/plugins/clangformat/clangformat.qbs
@@ -54,10 +54,8 @@ QtcPlugin {
        "clangformatutils.cpp",
    ]

-    Group {
-        name: "Tests"
+    QtcTestFiles {
        prefix: "tests/"
-        condition: qtc.testsEnabled
        cpp.defines: outer.concat('TESTDATA_DIR="' + sourceDirectory + "/tests/data" + '"')
        files: [
            "clangformat-test.cpp",
--- a/src/plugins/clangtools/clangtools.qbs
+++ b/src/plugins/clangtools/clangtools.qbs
@@ -74,9 +74,7 @@ QtcPlugin {
        "virtualfilesystemoverlay.h",
    ]

-    Group {
-        name: "Unit tests"
-        condition: qtc.testsEnabled
+    QtcTestFiles {
        files: [
            "clangtoolspreconfiguredsessiontests.cpp",
            "clangtoolspreconfiguredsessiontests.h",
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanager.qbs
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanager.qbs
@@ -21,9 +21,7 @@ QtcPlugin {
        "compilationdbparser.h",
    ]

-    Group {
-        name: "Tests"
-        condition: qtc.testsEnabled
+    QtcTestFiles {
        files: [
            "compilationdatabasetests.cpp",
            "compilationdatabasetests.h",
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -271,9 +271,7 @@ Project {
            ]
        }

-        Group {
-            name: "Tests"
-            condition: qtc.testsEnabled
+        QtcTestFiles {
            files: [
                "testdatadir.cpp",
                "testdatadir.h",
--- a/src/plugins/cppeditor/cppeditor.qbs
+++ b/src/plugins/cppeditor/cppeditor.qbs
@@ -245,9 +245,7 @@ QtcPlugin {
        ]
    }

-    Group {
-        name: "Tests"
-        condition: qtc.testsEnabled
+    QtcTestFiles {
        cpp.defines: outer.concat(['SRCDIR="' + FileInfo.path(filePath) + '"'])
        files: [
            "compileroptionsbuilder_test.cpp",
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -239,9 +239,7 @@ Project {
            ]
        }

-        Group {
-            name: "Unit tests"
-            condition: qtc.testsEnabled
+        QtcTestFiles {
            files: [
                "debuggerunittests.qrc",
            ]
--- a/src/plugins/designer/designer.qbs
+++ b/src/plugins/designer/designer.qbs
@@ -77,9 +77,7 @@ QtcPlugin {
        ]
    }

-    Group {
-        name: "Tests"
-        condition: qtc.testsEnabled
+    QtcTestFiles {
        files: [ "gotoslot_test.cpp" ]

        cpp.defines: outer.concat(['SRCDIR="' + FileInfo.path(filePath) + '"'])
--- a/src/plugins/fakevim/fakevim.qbs
+++ b/src/plugins/fakevim/fakevim.qbs
@@ -25,9 +25,7 @@ QtcPlugin {
        "fakevimtr.h",
    ]

-    Group {
-        name: "Tests"
-        condition: qtc.testsEnabled
+    QtcTestFiles {
        files: ["fakevim_test.cpp"]
    }
 }
--- a/src/plugins/mcusupport/mcusupport.qbs
+++ b/src/plugins/mcusupport/mcusupport.qbs
@@ -58,8 +58,7 @@ QtcPlugin {
        "settingshandler.cpp",
    ]

-    Group {
-        name: "McuSupport test files"
+    QtcTestFiles {
        condition: qtc.testsEnabled && (qtc_gtest_gmock.hasRepo || qtc_gtest_gmock.externalLibsPresent)
        prefix: "test/"
        files: [
--- a/src/plugins/perfprofiler/perfprofiler.qbs
+++ b/src/plugins/perfprofiler/perfprofiler.qbs
@@ -75,9 +75,7 @@ QtcPlugin {
        files: [ "PerfProfilerFlameGraphView.qml" ]
    }

-    Group {
-        name: "Unit tests"
-        condition: qtc.testsEnabled
+    QtcTestFiles {
        prefix: "tests/"
        files: [
            "perfprofilertracefile_test.cpp",
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -250,9 +250,7 @@ Project {
            ]
        }

-        Group {
-            name: "Tests"
-            condition: qtc.testsEnabled
+        QtcTestFiles {
            files: ["outputparser_test.h", "outputparser_test.cpp"]
        }

--- a/src/plugins/qmljstools/qmljstools.qbs
+++ b/src/plugins/qmljstools/qmljstools.qbs
@@ -54,9 +54,7 @@ QtcPlugin {
        "qmljstools.qrc"
    ]

-    Group {
-        name: "Tests"
-        condition: qtc.testsEnabled
+    QtcTestFiles {
        files: ["qmljstools_test.cpp"]
    }

--- a/src/plugins/qmlpreview/qmlpreview.qbs
+++ b/src/plugins/qmlpreview/qmlpreview.qbs
@@ -38,9 +38,7 @@ QtcPlugin {
        ]
    }

-    Group {
-        name: "Unit tests"
-        condition: qtc.testsEnabled
+    QtcTestFiles {
        prefix: "tests/"
        files: [
            "qmlpreviewclient_test.cpp",
--- a/src/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/src/plugins/qmlprofiler/qmlprofiler.qbs
@@ -73,9 +73,7 @@ QtcPlugin {
        files: "qml/**"
    }

-    Group {
-        name: "Unit tests"
-        condition: qtc.testsEnabled
+    QtcTestFiles {
        prefix: "tests/"
        files: [
            "debugmessagesmodel_test.cpp", "debugmessagesmodel_test.h",
--- a/src/plugins/remotelinux/remotelinux.qbs
+++ b/src/plugins/remotelinux/remotelinux.qbs
@@ -67,9 +67,7 @@ Project {
            "images/embeddedtarget.png",
        ]

-        Group {
-            name: "Tests"
-            condition: qtc.testsEnabled
+        QtcTestFiles {
            files: [
                "filesystemaccess_test.cpp",
                "filesystemaccess_test.h",
--- a/src/plugins/silversearcher/silversearcher.qbs
+++ b/src/plugins/silversearcher/silversearcher.qbs
@@ -13,9 +13,7 @@ QtcPlugin {
        "silversearcherplugin.cpp", "silversearcherplugin.h",
    ]

-    Group {
-        name: "Tests"
-        condition: qtc.testsEnabled
+    QtcTestFiles {
        files: [
            "outputparser_test.cpp",
            "outputparser_test.h",
--- a/src/plugins/texteditor/texteditor.qbs
+++ b/src/plugins/texteditor/texteditor.qbs
@@ -222,9 +222,7 @@ Project {
            ]
        }

-        Group {
-            name: "Tests"
-            condition: qtc.testsEnabled
+        QtcTestFiles {
            files: [
                "texteditor_test.cpp",
            ]
--- a/src/plugins/valgrind/valgrind.qbs
+++ b/src/plugins/valgrind/valgrind.qbs
@@ -76,9 +76,7 @@ QtcPlugin {
        ]
    }

-    Group {
-        name: "Test sources"
-        condition: qtc.testsEnabled
+    QtcTestFiles {
        files: [
            "valgrindmemcheckparsertest.cpp",
            "valgrindmemcheckparsertest.h",
--- a/src/plugins/vcpkg/vcpkg.qbs
+++ b/src/plugins/vcpkg/vcpkg.qbs
@@ -23,9 +23,7 @@ QtcPlugin {
        "vcpkgsettings.h",
    ]

-    Group {
-        name: "Unit tests"
-        condition: qtc.testsEnabled
+    QtcTestFiles {
        files: [
            "vcpkg_test.h",
            "vcpkg_test.cpp",
--- a/src/plugins/webassembly/webassembly.qbs
+++ b/src/plugins/webassembly/webassembly.qbs
@@ -33,9 +33,7 @@ QtcPlugin {
        "webassemblytoolchain.h",
    ]

-    Group {
-        name: "Unit tests"
-        condition: qtc.testsEnabled
+    QtcTestFiles {
        files: [
            "webassembly_test.cpp",
            "webassembly_test.h",