aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJochen Ulrich <jochenulrich@t-online.de>2019-08-05 23:58:22 +0200
committerJochen Ulrich <jochenulrich@t-online.de>2019-08-11 19:58:23 +0000
commit3fc363fd8755c18970f6c7c776acf5f2cb69150d (patch)
tree96cfcde45e2927b1801c5a9ab907ccb919b039bc
parent3c1f1eaca19eb0e382fe1663b3f69e279c3050b4 (diff)
Define jobPool for AutotestRunner
Change-Id: Ia90ea48e414fe9c4041f4bfc6961638b8a49fec4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--doc/reference/items/convenience/autotestrunner.qdoc16
-rw-r--r--share/qbs/imports/qbs/base/AutotestRunner.qbs2
2 files changed, 18 insertions, 0 deletions
diff --git a/doc/reference/items/convenience/autotestrunner.qdoc b/doc/reference/items/convenience/autotestrunner.qdoc
index defb2814e..e8690ffe2 100644
--- a/doc/reference/items/convenience/autotestrunner.qdoc
+++ b/doc/reference/items/convenience/autotestrunner.qdoc
@@ -1,6 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2019 Jochen Ulrich <jochenulrich@t-online.de>
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qbs.
@@ -67,6 +68,21 @@
qbs build -p autotest-runner
\endcode
\endlist
+
+ \section2 Relevant Job Pools
+ \target autotestrunner-job-pools
+
+ \table
+ \header
+ \li Pool
+ \li Since
+ \li Description
+ \row
+ \li \c{"autotest-runner"}
+ \li 1.15
+ \li The job pool used to run the tests.
+ \endtable
+
*/
/*!
diff --git a/share/qbs/imports/qbs/base/AutotestRunner.qbs b/share/qbs/imports/qbs/base/AutotestRunner.qbs
index b9adee88d..62ba7740b 100644
--- a/share/qbs/imports/qbs/base/AutotestRunner.qbs
+++ b/share/qbs/imports/qbs/base/AutotestRunner.qbs
@@ -1,6 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2019 Jochen Ulrich <jochenulrich@t-online.de>
** Contact: http://www.qt.io/licensing
**
** This file is part of Qbs.
@@ -97,6 +98,7 @@ Product {
cmd.environment = product.environment;
cmd.workingDirectory = workingDir;
cmd.timeout = timeout;
+ cmd.jobPool = "autotest-runner";
if (allowFailure)
cmd.maxExitCode = 32767;
return cmd;