diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-05-30 12:28:37 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-05-30 13:30:57 +0000 |
| commit | 78e19d1f234bb1ba9957c877e57d128f09d1459a (patch) | |
| tree | c9d612e66833edd5b74fcba5db50553848920d62 /share | |
| parent | cdb112e265dbb6b1bec673a15cdd9b1ee724244c (diff) | |
AutotestRunner: Make sure to run only the actual autotests
If products that come in via auxiliaryInputs are also applications,
then these would get run as well, which is wrong. Prevent that from
happening.
Change-Id: I9580fa4e5198f8a9ab2a0a36ef221c52e3881df8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/imports/qbs/base/AutotestRunner.qbs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/share/qbs/imports/qbs/base/AutotestRunner.qbs b/share/qbs/imports/qbs/base/AutotestRunner.qbs index 441ebd515..4f175d662 100644 --- a/share/qbs/imports/qbs/base/AutotestRunner.qbs +++ b/share/qbs/imports/qbs/base/AutotestRunner.qbs @@ -63,6 +63,13 @@ Product { alwaysUpdated: false } prepare: { + // TODO: This is hacky. Possible solution: Add autotest tag to application + // in autotest module and have that as inputsFromDependencies instead of application. + if (!input.product.type.contains("autotest")) { + var cmd = new JavaScriptCommand(); + cmd.silent = true; + return cmd; + } var commandFilePath; var installed = input.moduleProperty("qbs", "install"); if (installed) |