From 5ca714318c4b0c02f3b9ef98c5fc1c948c35219e Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 29 Sep 2022 11:04:18 +0200 Subject: Don't set QT_PLUGIN_PATH in the deployment test's run environment Otherwise we don't properly test whether the deployed executable can run without adjusting the environment. We temporarily adjust the test_widgets_app_deployment test and set CMAKE_INSTALL_LIBDIR to make the test pass. It would now fail on Linux distros where CMAKE_INSTALL_LIBDIR defaults to "lib64" but Qt is built with lib dir "lib". The next commit removes this hack. Change-Id: I63c79ef1ee23ffaeed881337fde6e9d889ecc0fe Reviewed-by: Alexandru Croitor --- tests/auto/cmake/CMakeLists.txt | 1 + tests/auto/cmake/test_widgets_app_deployment/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+) (limited to 'tests/auto/cmake') diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index 30cd340f16..e841308fc8 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -332,6 +332,7 @@ set(deploy_args # Need to explicitly specify a writable install prefix. BUILD_OPTIONS -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_widgets_app_deployment_installed + NO_RUN_ENVIRONMENT_PLUGIN_PATH ) # For now, the test should only pass on Windows and macOS shared and static builds and fail on diff --git a/tests/auto/cmake/test_widgets_app_deployment/CMakeLists.txt b/tests/auto/cmake/test_widgets_app_deployment/CMakeLists.txt index 60e3f0af75..9a0c4e8af1 100644 --- a/tests/auto/cmake/test_widgets_app_deployment/CMakeLists.txt +++ b/tests/auto/cmake/test_widgets_app_deployment/CMakeLists.txt @@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.16) project(deployment_api) enable_testing() +set(CMAKE_INSTALL_LIBDIR lib) ### temporary hack to make the test pass - remove in next commit! + find_package(Qt6 COMPONENTS REQUIRED Widgets Test) qt6_standard_project_setup() -- cgit v1.2.3