From f2d26f95fe12fe66ea1d30cf6205b667de1b9fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 18 May 2021 15:10:27 +0200 Subject: [PATCH] cmake: Add repository name to test labels for qt5 builds Change-Id: Icb23f2ea885f6d21bef80c587a431f7e9349f21b 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 c2a9d71780..a61066017d 100644 --- a/cmake/QtTestHelpers.cmake +++ b/cmake/QtTestHelpers.cmake @@ -266,7 +266,13 @@ function(qt_internal_add_test name) # Generate a label in the form tests/auto/foo/bar/tst_baz # and use it also for XML output - file(RELATIVE_PATH label "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/${name}") + set(label_base_directory "${PROJECT_SOURCE_DIR}") + if (QT_SUPERBUILD) + # Prepend repository name for qt5 builds, so that tests can be run for + # individual repositories. + set(label_base_directory "${label_base_directory}/..") + endif() + file(RELATIVE_PATH label "${label_base_directory}" "${CMAKE_CURRENT_SOURCE_DIR}/${name}") if (arg_LOWDPI) target_compile_definitions("${name}" PUBLIC TESTCASE_LOWDPI)