From edf9b23145f1e428c899b4696c9f361c165d7eb4 Mon Sep 17 00:00:00 2001 From: Andreas Buhr Date: Tue, 5 Apr 2022 13:13:03 +0200 Subject: [PATCH] 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 Pick-to: 6.2 6.3 Change-Id: Ia67ed6ab40a40f1b82861bd15bd04528ee9334ee Reviewed-by: Alexey Edelev Reviewed-by: Edward Welbourne Reviewed-by: Assam Boudjelthia --- src/tools/androidtestrunner/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/androidtestrunner/main.cpp b/src/tools/androidtestrunner/main.cpp index b6d68882a96..8a87e2fd8e1 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;