summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Buhr <andreas.buhr@qt.io>2022-04-05 13:13:03 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-04-05 20:46:40 +0000
commit1b21fe4c35dc29b77e3249ab6339ccd1208adf31 (patch)
tree05c3a9d4e21837c8ef7213f96c3f03bcda0e6cf4
parentb96267fe1a2c493aa958deb4774879e831045302 (diff)
Extend androidtestrunner default timeout to 8 minutes
qmake had a feature to set androidtestrunner's timeout. This feature is not yet ported to CMake. So with CMake, we always have androidtestrunner's default timeout. Which was five minutes. We have several tests which take just shy of five minutes and are thus flaky. This patch extends the timeout to eight minutes. This should be a temporary workaround until the timeout feature is implemented in CMake. Task-number: QTBUG-101596 Change-Id: Ia67ed6ab40a40f1b82861bd15bd04528ee9334ee Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit edf9b23145f1e428c899b4696c9f361c165d7eb4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/tools/androidtestrunner/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/androidtestrunner/main.cpp b/src/tools/androidtestrunner/main.cpp
index aa3c390563..44f6ef2428 100644
--- a/src/tools/androidtestrunner/main.cpp
+++ b/src/tools/androidtestrunner/main.cpp
@@ -64,7 +64,7 @@ struct Options
bool helpRequested = false;
bool verbose = false;
bool skipAddInstallRoot = false;
- std::chrono::seconds timeout{300}; // 5minutes
+ std::chrono::seconds timeout{480}; // 8 minutes
QString buildPath;
QString adbCommand{QStringLiteral("adb")};
QString makeCommand;