Commit 1199a93f authored by Christian Kandeler's avatar Christian Kandeler

qbs build: Make use of AutotestRunner.

And fix some autotest project file problems uncovered by this.

Change-Id: Id2f46aeab31ccfbcffe43bd23af8115c69f57849
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@theqtcompany.com>
parent d5a19a60
......@@ -2,7 +2,7 @@ import qbs
import qbs.FileInfo
QtcProduct {
type: "application"
type: ["application", "autotest"]
Depends { name: "Qt.test" }
Depends { name: "copyable_resource" }
targetName: "tst_" + name.split(' ').join("")
......
import qbs 1.0
Project {
minimumQbsVersion: "1.3"
minimumQbsVersion: "1.4"
property bool withAutotests: qbs.buildVariant === "debug"
property string ide_version_major: '3'
property string ide_version_minor: '3'
......@@ -61,4 +61,6 @@ Project {
"share/qtcreator/translations/translations.qbs",
"tests/tests.qbs"
]
AutotestRunner {}
}
......@@ -4,12 +4,6 @@ QtcAutotest {
name: "PluginManager autotest"
Depends { name: "Aggregation" }
Depends { name: "ExtensionSystem" }
Depends { name: "circular_plugin1" }
Depends { name: "circular_plugin2" }
Depends { name: "circular_plugin3" }
Depends { name: "correct_plugin1" }
Depends { name: "correct_plugin2" }
Depends { name: "correct_plugin3" }
files: "tst_pluginmanager.cpp"
cpp.defines: base.concat(['PLUGINMANAGER_TESTS_DIR="' + destinationDirectory + '"'])
......
import qbs
QtcAutotest {
type: ["application"] // Not to be executed directly by autotest-runner
name: "Memcheck " + testName + " autotest"
property string testName
targetName: testName // Test runner hardcodes the names of the executables
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment