diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2014-12-18 11:23:03 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2014-12-19 15:10:36 +0100 |
| commit | 1199a93fc0afe7e8fcf2281dc5deb62ffdfc0124 (patch) | |
| tree | 2c31bff17e8415d969124908131f2b01d6a09299 | |
| parent | d5a19a6005a66485a729658331f4a2d41a93758d (diff) | |
qbs build: Make use of AutotestRunner.
And fix some autotest project file problems uncovered by this.
Change-Id: Id2f46aeab31ccfbcffe43bd23af8115c69f57849
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | qbs/imports/QtcAutotest.qbs | 2 | ||||
| -rw-r--r-- | qtcreator.qbs | 4 | ||||
| -rw-r--r-- | tests/auto/extensionsystem/pluginmanager/test.qbs | 6 | ||||
| -rw-r--r-- | tests/auto/valgrind/memcheck/testapps/testapp.qbs | 1 |
4 files changed, 5 insertions, 8 deletions
diff --git a/qbs/imports/QtcAutotest.qbs b/qbs/imports/QtcAutotest.qbs index f24e11c7c5..103aa3b3f0 100644 --- a/qbs/imports/QtcAutotest.qbs +++ b/qbs/imports/QtcAutotest.qbs @@ -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("") diff --git a/qtcreator.qbs b/qtcreator.qbs index 90e5beecef..7b96d735aa 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -1,7 +1,7 @@ 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 {} } diff --git a/tests/auto/extensionsystem/pluginmanager/test.qbs b/tests/auto/extensionsystem/pluginmanager/test.qbs index 21ff8f6bf1..813c2452b6 100644 --- a/tests/auto/extensionsystem/pluginmanager/test.qbs +++ b/tests/auto/extensionsystem/pluginmanager/test.qbs @@ -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 + '"']) diff --git a/tests/auto/valgrind/memcheck/testapps/testapp.qbs b/tests/auto/valgrind/memcheck/testapps/testapp.qbs index 1f2de2578f..ed0a8573db 100644 --- a/tests/auto/valgrind/memcheck/testapps/testapp.qbs +++ b/tests/auto/valgrind/memcheck/testapps/testapp.qbs @@ -1,6 +1,7 @@ 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 |