From b2588969ce4f082de10d17809c51e4285fbf94c3 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Thu, 14 Nov 2024 13:38:19 +0200 Subject: [PATCH] Android: use --verbose for tests by default for CI If the QT_BUILD_ENVIRONMENT is set to ci, add --verbose by default. Pick-to: 6.8 Change-Id: Ia9f2ba4c0191649d43a17bd76f61ca46180345d7 Reviewed-by: Alexandru Croitor --- cmake/QtTestHelpers.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake index 8bacc141525..f4a38aec76c 100644 --- a/cmake/QtTestHelpers.cmake +++ b/cmake/QtTestHelpers.cmake @@ -668,7 +668,13 @@ function(qt_internal_add_test name) endif() qt_internal_android_test_runner_arguments("${name}" test_executable extra_test_args) list(APPEND extra_test_args "--timeout" "${android_timeout}") - if(QT_ENABLE_VERBOSE_DEPLOYMENT) + + set(build_environment "") + if(DEFINED ENV{QT_BUILD_ENVIRONMENT}) + set(build_environment "$ENV{QT_BUILD_ENVIRONMENT}") + endif() + + if(QT_ENABLE_VERBOSE_DEPLOYMENT OR build_environment STREQUAL "ci") list(APPEND extra_test_args "--verbose") endif() set(test_working_dir "${CMAKE_CURRENT_BINARY_DIR}")