diff options
Diffstat (limited to 'share/qbs/imports/qbs/base/AutotestRunner.qbs')
| -rw-r--r-- | share/qbs/imports/qbs/base/AutotestRunner.qbs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/share/qbs/imports/qbs/base/AutotestRunner.qbs b/share/qbs/imports/qbs/base/AutotestRunner.qbs index ab9ba15f7..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. @@ -42,6 +43,7 @@ Product { property stringList wrapper: [] property string workingDir property stringList auxiliaryInputs + property int timeout: -1 Depends { productTypes: "autotest" @@ -74,6 +76,7 @@ Product { : FileInfo.path(commandFilePath); var arguments = product.arguments; var allowFailure = false; + var timeout = product.timeout; if (input.autotest) { // FIXME: We'd like to let the user override with an empty list, but // qbscore turns undefined lists into empty ones at the moment. @@ -83,6 +86,9 @@ Product { if (input.autotest.workingDir) workingDir = input.autotest.workingDir; allowFailure = input.autotest.allowFailure; + + if (input.autotest.timeout !== undefined) + timeout = input.autotest.timeout; } var fullCommandLine = product.wrapper .concat([commandFilePath]) @@ -91,6 +97,8 @@ Product { cmd.description = "Running test " + input.fileName; cmd.environment = product.environment; cmd.workingDirectory = workingDir; + cmd.timeout = timeout; + cmd.jobPool = "autotest-runner"; if (allowFailure) cmd.maxExitCode = 32767; return cmd; |