From 50a214de9e8444f3e43e9b1013c95072f8ff196f Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 21 Mar 2023 10:01:28 +0100 Subject: [PATCH] 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: Reviewed-by: Christian Stenger --- qbs/imports/QtcTestFiles.qbs | 6 ++++++ src/plugins/android/android.qbs | 4 +--- src/plugins/autotest/autotest.qbs | 4 +--- src/plugins/clangcodemodel/clangcodemodel.qbs | 4 +--- src/plugins/clangformat/clangformat.qbs | 4 +--- src/plugins/clangtools/clangtools.qbs | 4 +--- .../compilationdatabaseprojectmanager.qbs | 4 +--- src/plugins/coreplugin/coreplugin.qbs | 4 +--- src/plugins/cppeditor/cppeditor.qbs | 4 +--- src/plugins/debugger/debugger.qbs | 4 +--- src/plugins/designer/designer.qbs | 4 +--- src/plugins/fakevim/fakevim.qbs | 4 +--- src/plugins/mcusupport/mcusupport.qbs | 3 +-- src/plugins/perfprofiler/perfprofiler.qbs | 4 +--- src/plugins/projectexplorer/projectexplorer.qbs | 4 +--- src/plugins/qmljstools/qmljstools.qbs | 4 +--- src/plugins/qmlpreview/qmlpreview.qbs | 4 +--- src/plugins/qmlprofiler/qmlprofiler.qbs | 4 +--- src/plugins/remotelinux/remotelinux.qbs | 4 +--- src/plugins/silversearcher/silversearcher.qbs | 4 +--- src/plugins/texteditor/texteditor.qbs | 4 +--- src/plugins/valgrind/valgrind.qbs | 4 +--- src/plugins/vcpkg/vcpkg.qbs | 4 +--- src/plugins/webassembly/webassembly.qbs | 4 +--- 24 files changed, 29 insertions(+), 68 deletions(-) create mode 100644 qbs/imports/QtcTestFiles.qbs diff --git a/qbs/imports/QtcTestFiles.qbs b/qbs/imports/QtcTestFiles.qbs new file mode 100644 index 00000000000..ab27a8df8a1 --- /dev/null +++ b/qbs/imports/QtcTestFiles.qbs @@ -0,0 +1,6 @@ +import qbs 1.0 + +Group { + name: "Unit tests" + condition: qtc.testsEnabled +} diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs index 5c9b6564c7b..c6d1611636f 100644 --- 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", diff --git a/src/plugins/autotest/autotest.qbs b/src/plugins/autotest/autotest.qbs index f0bccd79c33..90f1728c4ae 100644 --- 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", diff --git a/src/plugins/clangcodemodel/clangcodemodel.qbs b/src/plugins/clangcodemodel/clangcodemodel.qbs index b4a1bc93a53..903a81147a9 100644 --- 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", diff --git a/src/plugins/clangformat/clangformat.qbs b/src/plugins/clangformat/clangformat.qbs index bd1b9677632..057035cd1a6 100644 --- 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", diff --git a/src/plugins/clangtools/clangtools.qbs b/src/plugins/clangtools/clangtools.qbs index 9c86d4bb113..ad8543bf611 100644 --- 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", diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanager.qbs b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanager.qbs index 9c12b05a3a7..ce7e4e35ac3 100644 --- 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", diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs index be30292174b..b99b8be2dfb 100644 --- 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", diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs index cb7b145078c..1824af07090 100644 --- 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", diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs index 50f1eba24f9..8319bea822b 100644 --- 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", ] diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs index 411be43283b..b730485329d 100644 --- 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) + '"']) diff --git a/src/plugins/fakevim/fakevim.qbs b/src/plugins/fakevim/fakevim.qbs index cdfb9e24ddf..a4dad38428f 100644 --- 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"] } } diff --git a/src/plugins/mcusupport/mcusupport.qbs b/src/plugins/mcusupport/mcusupport.qbs index e6aec151a06..b0fa090b414 100644 --- 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: [ diff --git a/src/plugins/perfprofiler/perfprofiler.qbs b/src/plugins/perfprofiler/perfprofiler.qbs index f3151ae0a63..7a037e7fa47 100644 --- 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", diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index 315a8d361e0..23870334857 100644 --- 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"] } diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs index 68c9a9dfc15..d13342e8dd2 100644 --- 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"] } diff --git a/src/plugins/qmlpreview/qmlpreview.qbs b/src/plugins/qmlpreview/qmlpreview.qbs index 7b0f96dde76..e44f432c41a 100644 --- 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", diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs index 5cc3604a07b..56a1e00cd6a 100644 --- 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", diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs index 94a3878fe04..03a6afad10f 100644 --- 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", diff --git a/src/plugins/silversearcher/silversearcher.qbs b/src/plugins/silversearcher/silversearcher.qbs index f099858f6e3..8cf2cd15090 100644 --- 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", diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs index 2aacf5d3736..1b94811a563 100644 --- 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", ] diff --git a/src/plugins/valgrind/valgrind.qbs b/src/plugins/valgrind/valgrind.qbs index f0e117ce98a..973b1d7b85a 100644 --- 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", diff --git a/src/plugins/vcpkg/vcpkg.qbs b/src/plugins/vcpkg/vcpkg.qbs index 9ab32702090..dff796ab917 100644 --- 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", diff --git a/src/plugins/webassembly/webassembly.qbs b/src/plugins/webassembly/webassembly.qbs index 9c6e95f99f7..b859ea538a2 100644 --- 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",