qbs build: Fix manual tests

- Remove dependency on project.withAutotests by adding local {Qt,Cpp}Application overrides that alias QtcManualTest. This way, the respective products are a QtcManualTest when inside Qt Creator, while also working outside the source tree. - Rename QtcManualtest to QtcManualTest. (The reason QtcAutotest is not camel-cased is because "autotest" is a single word.) - Plus some minor clean-ups. Change-Id: Idd77191f0b433d6d7443c639eebda383ab110082 Reviewed-by: Christian Stenger <[email protected]> Reviewed-by: <[email protected]>
openmv · Sep 20, 2023 · fca94a8 · fca94a8
1 parent 9f7f175
commit fca94a8
Show file tree

Hide file tree

Showing 25 changed files with 42 additions and 73 deletions.
diff --git a/qbs/imports/QtcManualtest.qbs → qbs/imports/QtcManualTest.qbs b/qbs/imports/QtcManualtest.qbs → qbs/imports/QtcManualTest.qbs
diff --git a/qtcreator.qbs b/qtcreator.qbs
@@ -1,7 +1,7 @@
 Project {
     name: "Qt Creator"
     minimumQbsVersion: "2.0.0"
-    property bool withAutotests: qbs.buildVariant === "debug" // FIXME: Remove
+    property bool withAutotests: qbs.buildVariant === "debug" // TODO: compat, remove
     property path ide_source_tree: path
     property pathList additionalPlugins: []
     property pathList additionalLibs: []

diff --git a/tests/manual/debugger/gui/gui.qbs b/tests/manual/debugger/gui/gui.qbs
@@ -1,6 +1,6 @@
 QtApplication {
     name: "Manual debugger gui test"
-    Depends { name: "qtc" }
+
     Depends { name: "Qt.widgets" }
 
     files: [

diff --git a/tests/manual/debugger/simple/simple_test_app.qbs b/tests/manual/debugger/simple/simple_test_app.qbs
@@ -2,11 +2,9 @@ import qbs.File
 import qbs.FileInfo
 
 CppApplication {
-    condition: qtc.withAutotests
     name: "Manual Test Simple Application"
     targetName: "simple_test_app"
 
-    Depends { name: "qtc" }
     Depends { name: "Qt.core" }
     Depends { name: "Qt.core-private"; required: false; condition: Qt.core.versionMajor > 4 }
     Depends { name: "Qt.core5compat"; condition: Qt.core.versionMajor > 5 }

diff --git a/tests/manual/debugger/simple/simple_test_plugin.qbs b/tests/manual/debugger/simple/simple_test_plugin.qbs
@@ -1,11 +1,11 @@
 import qbs.FileInfo
 
 DynamicLibrary {
-    condition: qtc.withAutotests
+    condition: !qtc.present || qtc.withAutotests
     name: "Manual Test Simple Plugin"
     targetName: "simple_test_plugin"
 
-    Depends { name: "qtc" }
+    Depends { name: "qtc"; required: false }
     Depends { name: "Qt.core" }
 
     files: [ "simple_test_plugin.cpp" ]

diff --git a/tests/manual/deviceshell/deviceshell.qbs b/tests/manual/deviceshell/deviceshell.qbs
@@ -1,22 +1,19 @@
 import qbs.FileInfo
 
-Project  {
-    QtcManualtest {
-        name: "DeviceShell manualtest"
+QtcManualTest {
+    name: "DeviceShell manualtest"
 
-        Depends { name: "Utils" }
-        Depends { name: "app_version_header" }
+    Depends { name: "Utils" }
+    Depends { name: "app_version_header" }
 
-        files: [
-            "tst_deviceshell.cpp",
-        ]
-        cpp.defines: {
-            var defines = base;
-            var absLibExecPath = FileInfo.joinPaths(qbs.installRoot, qbs.installPrefix,
-                                                    qtc.ide_libexec_path);
-            var relLibExecPath = FileInfo.relativePath(destinationDirectory, absLibExecPath);
-            defines.push('TEST_RELATIVE_LIBEXEC_PATH="' + relLibExecPath + '"');
-            return defines;
-        }
+    cpp.defines: {
+        var defines = base;
+        var absLibExecPath = FileInfo.joinPaths(qbs.installRoot, qbs.installPrefix,
+                                                qtc.ide_libexec_path);
+        var relLibExecPath = FileInfo.relativePath(destinationDirectory, absLibExecPath);
+        defines.push('TEST_RELATIVE_LIBEXEC_PATH="' + relLibExecPath + '"');
+        return defines;
     }
+
+    files: "tst_deviceshell.cpp"
 }
diff --git a/tests/manual/fakevim/fakevim.qbs b/tests/manual/fakevim/fakevim.qbs
@@ -1,6 +1,6 @@
 import qbs.FileInfo
 
-QtcManualtest {
+QtcManualTest {
     name: "Manual FakeVim test"
     type: ["application"]
 
@@ -11,9 +11,7 @@ QtcManualtest {
     cpp.defines: base.concat(["FAKEVIM_STANDALONE"])
     cpp.includePaths: fakeVimDir
 
-    files: [
-        "main.cpp"
-    ]
+    files: "main.cpp"
 
     Group {
         name: "FakeVim files"

diff --git a/tests/manual/manual.qbs b/tests/manual/manual.qbs
@@ -1,7 +1,7 @@
 Project {
-    name: "QtcManualtests"
+    name: "QtcManualTests"
 
-    condition: project.withAutotests // FIXME: Why are these not QtcManualTests?
+    qbsSearchPaths: "qbs"
 
     references: [
         "debugger/gui/gui.qbs",

diff --git a/tests/manual/pluginview/plugins/plugin1/plugin1.qbs b/tests/manual/pluginview/plugins/plugin1/plugin1.qbs
@@ -1,6 +1,6 @@
 import qbs.FileInfo
 
-QtcManualtest {
+QtcManualTest {
     name: "Manual test plugin1"
     targetName: "plugin1"
     type: [ "dynamiclibrary" ]

diff --git a/tests/manual/pluginview/plugins/plugin2/plugin2.qbs b/tests/manual/pluginview/plugins/plugin2/plugin2.qbs
@@ -1,6 +1,6 @@
 import qbs.FileInfo
 
-QtcManualtest {
+QtcManualTest {
     name: "Manual test plugin2"
     targetName: "plugin2"
     type: [ "dynamiclibrary" ]

diff --git a/tests/manual/pluginview/plugins/plugin3/plugin3.qbs b/tests/manual/pluginview/plugins/plugin3/plugin3.qbs
@@ -1,6 +1,6 @@
 import qbs.FileInfo
 
-QtcManualtest {
+QtcManualTest {
     name: "Manual test plugin3"
     targetName: "plugin3"
     type: [ "dynamiclibrary" ]

diff --git a/tests/manual/pluginview/pluginview.qbs b/tests/manual/pluginview/pluginview.qbs
@@ -1,7 +1,7 @@
 Project {
     name: "Manual plugin test"
 
-    QtcManualtest {
+    QtcManualTest {
         name: "Manual plugin view test"
 
         Depends { name: "ExtensionSystem" }

diff --git a/tests/manual/proparser/testreader.qbs b/tests/manual/proparser/testreader.qbs
@@ -1,4 +1,4 @@
-QtcManualtest {
+QtcManualTest {
     name: "Manual ProParser test"
     Depends { name: "Qt.core" }
 
@@ -18,9 +18,7 @@ QtcManualtest {
         cpp.dynamicLibraries: "advapi32"
     }
 
-    files: [
-        "main.cpp",
-    ]
+    files: "main.cpp"
 
     Group {
         name: "ProParser files"

diff --git a/tests/manual/qbs/imports/CppApplication.qbs b/tests/manual/qbs/imports/CppApplication.qbs
@@ -0,0 +1 @@
+QtcManualTest {}
diff --git a/tests/manual/qbs/imports/QtApplication.qbs b/tests/manual/qbs/imports/QtApplication.qbs
@@ -0,0 +1 @@
+QtcManualTest {}
diff --git a/tests/manual/shootout/shootout.qbs b/tests/manual/shootout/shootout.qbs
@@ -1,7 +1,5 @@
-QtcManualtest {
+QtcManualTest {
     name: "Manual debugger shootout test"
 
-    files: [
-        "tst_codesize.cpp",
-    ]
+    files: "tst_codesize.cpp"
 }
diff --git a/tests/manual/spinner/spinner.qbs b/tests/manual/spinner/spinner.qbs
@@ -1,13 +1,11 @@
 import qbs.FileInfo
 
-QtcManualtest {
+QtcManualTest {
     name: "Spinner example"
     type: ["application"]
 
     Depends { name: "Qt"; submodules: ["widgets"] }
     Depends { name: "Spinner" }
 
-    files: [
-        "main.cpp",
-    ]
+    files: "main.cpp"
 }
diff --git a/tests/manual/subdirfilecontainer/subdirfilecontainer.qbs b/tests/manual/subdirfilecontainer/subdirfilecontainer.qbs
@@ -1,15 +1,13 @@
 import qbs.FileInfo
 
-QtcManualtest {
+QtcManualTest {
     name: "Manual SubDirFileContainer test"
     type: ["application"]
 
     Depends { name: "Utils" }
     Depends { name: "app_version_header" }
 
-    files: [
-        "tst_subdirfilecontainer.cpp",
-    ]
+    files: "tst_subdirfilecontainer.cpp"
 
     cpp.defines: {
         var defines = base;

diff --git a/tests/manual/tasking/demo/demo.qbs b/tests/manual/tasking/demo/demo.qbs
@@ -1,6 +1,6 @@
 import qbs.FileInfo
 
-QtcManualtest {
+QtcManualTest {
     name: "Tasking demo"
     type: ["application"]
 

diff --git a/tests/manual/tasking/imagescaling/imagescaling.qbs b/tests/manual/tasking/imagescaling/imagescaling.qbs
@@ -1,6 +1,4 @@
-import qbs.FileInfo
-
-QtcManualtest {
+QtcManualTest {
     name: "Tasking imagescaling"
     type: ["application"]
 

diff --git a/tests/manual/widgets/crumblepath/crumblepath.qbs b/tests/manual/widgets/crumblepath/crumblepath.qbs
@@ -3,13 +3,10 @@ import "../common/common.qbs" as Common
 CppApplication {
     name: "Manual Test Utils CrumblePath"
 
-    Depends { name: "qtc" }
     Depends { name: "Core" }
     Depends { name: "Utils" }
 
-    files: [
-        "tst_manual_widgets_crumblepath.cpp",
-    ]
+    files: "tst_manual_widgets_crumblepath.cpp"
 
     Common {}
 }
diff --git a/tests/manual/widgets/infolabel/infolabel.qbs b/tests/manual/widgets/infolabel/infolabel.qbs
@@ -3,13 +3,10 @@ import "../common/common.qbs" as Common
 CppApplication {
     name: "Manual Test Utils InfoLabel"
 
-    Depends { name: "qtc" }
     Depends { name: "Core" }
     Depends { name: "Utils" }
 
-    files: [
-        "tst_manual_widgets_infolabel.cpp",
-    ]
+    files: "tst_manual_widgets_infolabel.cpp"
 
     Common {}
 }
diff --git a/tests/manual/widgets/layoutbuilder/layoutbuilder.qbs b/tests/manual/widgets/layoutbuilder/layoutbuilder.qbs
@@ -1,12 +1,8 @@
-
 CppApplication {
     name: "Manual Test Utils LayoutBuilder"
 
-    Depends { name: "qtc" }
     Depends { name: "Core" }
     Depends { name: "Utils" }
 
-    files: [
-        "tst_manual_widgets_layoutbuilder.cpp",
-    ]
+    files: "tst_manual_widgets_layoutbuilder.cpp"
 }
diff --git a/tests/manual/widgets/manhattanstyle/manhattanstyle.qbs b/tests/manual/widgets/manhattanstyle/manhattanstyle.qbs
@@ -3,13 +3,10 @@ import "../common/common.qbs" as Common
 CppApplication {
     name: "Manual Test Utils ManhattanStyle"
 
-    Depends { name: "qtc" }
     Depends { name: "Core" }
     Depends { name: "Utils" }
 
-    files: [
-        "tst_manual_widgets_manhattanstyle.cpp",
-    ]
+    files: "tst_manual_widgets_manhattanstyle.cpp"
 
     Common {}
 }
diff --git a/tests/manual/widgets/tracing/tracing.qbs b/tests/manual/widgets/tracing/tracing.qbs
@@ -3,15 +3,12 @@ import "../common/common.qbs" as Common
 CppApplication {
     name: "Manual Test Tracing"
 
-    Depends { name: "qtc" }
     Depends { name: "Qt.quick" }
     Depends { name: "Tracing" }
     Depends { name: "Utils" }
     Depends { name: "Core" }
 
-    files: [
-        "tst_manual_widgets_tracing.cpp",
-    ]
+    files: "tst_manual_widgets_tracing.cpp"
 
     Common {}
 }