summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-12-03 18:08:01 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-12-03 17:46:20 +0000
commit110d0e79c0d64bd7cf3ef3c85b9e1530e1912c94 (patch)
treed2fb42aea2a264b739fcfad98b8f5b0c83598ef5 /tests/auto
parent7641fe2ecda840911db5cdc2a99c45e7a1bcd313 (diff)
tst_macdeployqt: Increase timeout for make
The default timeout of 10s (runProcess()) is a bit short for COIN testing. Change-Id: I8e125e7261674143adea06775aee683439548465 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit fb72c61bd0f53e4700042007e8be29d72a502ee3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/macdeployqt/tst_macdeployqt.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/macdeployqt/tst_macdeployqt.cpp b/tests/auto/macdeployqt/tst_macdeployqt.cpp
index fd2dd24aa..8586cff9e 100644
--- a/tests/auto/macdeployqt/tst_macdeployqt.cpp
+++ b/tests/auto/macdeployqt/tst_macdeployqt.cpp
@@ -130,7 +130,8 @@ bool qmake(const QString &source, const QString &destination, QString *errorMess
bool make(const QString &destination, QString *errorMessage)
{
QStringList args;
- return runProcess(g_makeBinary, args, errorMessage, destination);
+ return runProcess(g_makeBinary, args, errorMessage, destination,
+ {}, 60000);
}
void build(const QString &name)