From b9053b55f8e0f1750526e117d9c059a0bd883baf Mon Sep 17 00:00:00 2001 From: Mikolaj Boc Date: Thu, 25 Aug 2022 18:16:02 +0200 Subject: [PATCH] Place test helpers in batched test output directory unless overridden Change-Id: Ica209d10773d1acc38c3bad934cb53856e6a6c2a Reviewed-by: Alexandru Croitor --- cmake/QtTestHelpers.cmake | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake index 8bd09dec46f..556115ec656 100644 --- a/cmake/QtTestHelpers.cmake +++ b/cmake/QtTestHelpers.cmake @@ -765,7 +765,14 @@ function(qt_internal_add_test_helper name) set(extra_args_to_pass) if(NOT arg_OVERRIDE_OUTPUT_DIRECTORY) - set(extra_args_to_pass OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/..") + if(QT_BUILD_TESTS_BATCHED) + _qt_internal_test_batch_target_name(test_batch_target_name) + get_target_property( + test_batch_output_dir ${test_batch_target_name} RUNTIME_OUTPUT_DIRECTORY) + set(extra_args_to_pass OUTPUT_DIRECTORY "${test_batch_output_dir}") + else() + set(extra_args_to_pass OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/..") + endif() endif() qt_internal_add_executable("${name}" NO_INSTALL ${extra_args_to_pass} ${forward_args})