diff options
| -rw-r--r-- | cmake/QtPlatformAndroid.cmake | 1 | ||||
| -rw-r--r-- | src/tools/androidtestrunner/main.cpp | 3 |
2 files changed, 3 insertions, 1 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 ) diff --git a/src/tools/androidtestrunner/main.cpp b/src/tools/androidtestrunner/main.cpp index a5e249affc..60dfc84ab3 100644 --- a/src/tools/androidtestrunner/main.cpp +++ b/src/tools/androidtestrunner/main.cpp @@ -397,7 +397,8 @@ static bool waitToFinish() // Wait to finish while (isRunning()) { std::this_thread::sleep_for(std::chrono::milliseconds(250)); - if ((clock::now() - start) > g_options.timeout) + if (g_options.timeout >= std::chrono::seconds::zero() + && (clock::now() - start) > g_options.timeout) return false; } return true; |