summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2022-09-19 15:48:27 +0200
committerUlf Hermann <ulf.hermann@qt.io>2022-09-21 14:00:37 +0200
commit00b9409843c1a0934aca5082d0ef41e5d1a93d7a (patch)
treeee56662794d11ece52c956ce21ff4e901c1371ef /cmake
parenta1e19c4a8c953dbeb2b371aca44ab333786e19a4 (diff)
Android: Disable androidtestrunner extra timeout
We already have: a, a timeout as part of QtTest. By default it lets each test function run for 5 minutes. This timeout can be configured using QTEST_FUNCTION_TIMEOUT. b, maxTimeBetweenOutput in the CI. The CI will kill the process if too much time passes between individual output lines of a test. c, maxTimeInSeconds in the CI. This does exactly the same as the androidtestrunner timeout. The CI timeouts can be centrally tuned per platform and Qt module. This is preferable over a special timeout just for android. As other people may be using androidtestrunner for unrelated projects, don't delete the timeout, but simply disable it from CMake by setting it to -1. Task-number: QTBUG-106479 Task-number: QTBUG-101596 Task-number: QTBUG-100242 Change-Id: If4ce00948e204182bb12ac4859d3b0dd193de7ad Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Dimitrios Apostolou <jimis@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtPlatformAndroid.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/cmake/QtPlatformAndroid.cmake b/cmake/QtPlatformAndroid.cmake
index 3b3c548f10..7bdc15bd98 100644
--- a/cmake/QtPlatformAndroid.cmake
+++ b/cmake/QtPlatformAndroid.cmake
@@ -203,6 +203,7 @@ function(qt_internal_android_test_arguments target out_test_runner out_test_argu
"--skip-install-root"
"--make" "${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target ${target}_make_apk"
"--apk" "${apk_dir}/${target}.apk"
+ "--timeout" "-1"
"--verbose"
PARENT_SCOPE
)