diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-08 11:12:54 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-08 10:47:04 +0000 |
commit | 18469dc468b488562557b0fa77037c2a555962db (patch) | |
tree | 02aba4bc7f26fc5a861e74e3b9ae594286514e35 /tests/auto/blackbox/testdata-qt | |
parent | f498b226112f78509688288f121be4afecb8507e (diff) |
Simplify some autotests
... by using "qbs run" instead of manually executing the applications.
Change-Id: I548f7721acff3aac6644944ad7436ad8bcfa1867
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'tests/auto/blackbox/testdata-qt')
3 files changed, 2 insertions, 18 deletions
diff --git a/tests/auto/blackbox/testdata-qt/auto-qrc/auto-qrc.qbs b/tests/auto/blackbox/testdata-qt/auto-qrc/auto-qrc.qbs index 3055e51b8..63906fd77 100644 --- a/tests/auto/blackbox/testdata-qt/auto-qrc/auto-qrc.qbs +++ b/tests/auto/blackbox/testdata-qt/auto-qrc/auto-qrc.qbs @@ -31,22 +31,4 @@ Project { } } } - - Product { - name: "runner" - type: ["runner"] - Depends { name: "app" } - Rule { - inputsFromDependencies: ["application"] - Artifact { - filePath: "dummy" - fileTags: ["runner"] - } - prepare: { - var cmd = new Command(input.filePath); - cmd.description = "running " + input.filePath; - return [cmd]; - } - } - } } diff --git a/tests/auto/blackbox/testdata-qt/plugin-meta-data/app.cpp b/tests/auto/blackbox/testdata-qt/plugin-meta-data/app.cpp index e5fd8ec57..8f2aec87d 100644 --- a/tests/auto/blackbox/testdata-qt/plugin-meta-data/app.cpp +++ b/tests/auto/blackbox/testdata-qt/plugin-meta-data/app.cpp @@ -78,5 +78,6 @@ int main(int argc, char *argv[]) qDebug() << "metadata:" << metaData; return 1; } + qDebug() << "all ok!"; return 0; } diff --git a/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs b/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs index df51dd386..d44b82d4a 100644 --- a/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs +++ b/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs @@ -2,6 +2,7 @@ import qbs Project { QtApplication { + name: "app" consoleApplication: true Depends { name: "thePlugin" } |