From 3729d37dd9ad38044242097adaa4bd74e2d5de87 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Tue, 22 Dec 2020 21:03:24 +0100 Subject: [PATCH] Fix the CMake feature for docker-testserver to use correct mkspecs path Use the QT_MKSPECS_DIR instead of QT_SOURCE_TREE to find out the location for the testserver feature's data. QT_SOURCE_TREE points to qtbase source location, which may not be always available. This allows to use this feature by projects outside of qtbase. Task-number: QTBUG-85034 Change-Id: If7fa6ef95777be9acf35d36f8d99776bf9568a79 Reviewed-by: Cristian Adam --- cmake/QtTestHelpers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake index b2fab788a4..e1da4a5340 100644 --- a/cmake/QtTestHelpers.cmake +++ b/cmake/QtTestHelpers.cmake @@ -158,7 +158,7 @@ function(qt_internal_setup_docker_test_fixture name) foreach(test_name ${name} ${name}-setup ${name}-cleanup) set_property(TEST "${test_name}" APPEND PROPERTY ENVIRONMENT "testserver=${QT_DOCKER_COMPOSE_VERSION}") set_property(TEST "${test_name}" APPEND PROPERTY ENVIRONMENT TEST_DOMAIN=${DNSDOMAIN}) - set_property(TEST "${test_name}" APPEND PROPERTY ENVIRONMENT "SHARED_DATA=${QT_SOURCE_TREE}/mkspecs/features/data/testserver") + set_property(TEST "${test_name}" APPEND PROPERTY ENVIRONMENT "SHARED_DATA=${QT_MKSPECS_DIR}/features/data/testserver") set_property(TEST "${test_name}" APPEND PROPERTY ENVIRONMENT SHARED_SERVICE=bridge-network) endforeach()