diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-03-02 22:04:02 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-03-17 09:52:54 +0000 |
| commit | 1acc9d3195b740541a7469bbe6c3ef54c5f22b51 (patch) | |
| tree | 7dd19592f9f047750038175371c900abd26b988c /tests | |
| parent | 1fe7701c07401241e3f0fcd78b0505e3ac6b58cd (diff) | |
Fix building unit tests with bundled Qt.script
Some of those tests require Qt.script headers which are used in
corelib's headers. Introduce a new QbsUnitTest item type that pulls in
the dependency on Qt.script/scriptengine for those tests.
Change-Id: I5b981b910191ba690eded14bdf64b540f334bd53
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/buildgraph/buildgraph.qbs | 2 | ||||
| -rw-r--r-- | tests/auto/language/language.qbs | 7 | ||||
| -rw-r--r-- | tests/auto/tools/tools.qbs | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/tests/auto/buildgraph/buildgraph.qbs b/tests/auto/buildgraph/buildgraph.qbs index 3fbb57575..c6414b688 100644 --- a/tests/auto/buildgraph/buildgraph.qbs +++ b/tests/auto/buildgraph/buildgraph.qbs @@ -1,6 +1,6 @@ import qbs -QbsAutotest { +QbsUnittest { Depends { name: "qbsconsolelogger" } testName: "buildgraph" condition: qbsbuildconfig.enableUnitTests diff --git a/tests/auto/language/language.qbs b/tests/auto/language/language.qbs index 22fef1618..d3619a243 100644 --- a/tests/auto/language/language.qbs +++ b/tests/auto/language/language.qbs @@ -1,14 +1,9 @@ import qbs import qbs.Utilities -QbsAutotest { +QbsUnittest { Depends { name: "qbsversion" } Depends { name: "qbsconsolelogger" } - Depends { - name: "Qt.script" - condition: !qbsbuildconfig.useBundledQtScript - required: false - } testName: "language" condition: qbsbuildconfig.enableUnitTests diff --git a/tests/auto/tools/tools.qbs b/tests/auto/tools/tools.qbs index 64cced80e..384ba74eb 100644 --- a/tests/auto/tools/tools.qbs +++ b/tests/auto/tools/tools.qbs @@ -1,7 +1,7 @@ import qbs import qbs.Utilities -QbsAutotest { +QbsUnittest { Depends { name: "qbsversion" } testName: "tools" |