summaryrefslogtreecommitdiffstats
path: root/cmake/QtTestHelpers.cmake
diff options
context:
space:
mode:
authorAssam Boudjelthia <[email protected]>2024-11-14 13:38:19 +0200
committerAssam Boudjelthia <[email protected]>2024-11-14 17:15:08 +0200
commitb2588969ce4f082de10d17809c51e4285fbf94c3 (patch)
tree207d207fbed159e2abd835592aad08922d694366 /cmake/QtTestHelpers.cmake
parent705bac063cc5ec535ff5467a208d5653555ae8f9 (diff)
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 <[email protected]>
Diffstat (limited to 'cmake/QtTestHelpers.cmake')
-rw-r--r--cmake/QtTestHelpers.cmake8
1 files changed, 7 insertions, 1 deletions
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}")