From c9fefcf98bdefecfec8309a5cb97471d5c50716c Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 23 Mar 2021 16:30:03 +0100 Subject: [PATCH] Move bin/qt-internal-configure-tests to libexec Task-number: QTBUG-88791 Change-Id: I78613128760b5820e6db17b0c09462e34f7c7bb2 Reviewed-by: Qt CI Bot Reviewed-by: Alexandru Croitor (cherry picked from commit 4ae9922166ba81c9efea5b2af29898eb20a1fd63) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtWrapperScriptHelpers.cmake | 8 ++++---- coin/instructions/call_cmake_for_standalone_tests.yaml | 2 +- {bin => libexec}/qt-internal-configure-tests.in | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename {bin => libexec}/qt-internal-configure-tests.in (100%) diff --git a/cmake/QtWrapperScriptHelpers.cmake b/cmake/QtWrapperScriptHelpers.cmake index 15b0ca9eca0..14958d2ce6f 100644 --- a/cmake/QtWrapperScriptHelpers.cmake +++ b/cmake/QtWrapperScriptHelpers.cmake @@ -152,10 +152,10 @@ function(qt_internal_create_qt_configure_tests_wrapper_script) string(APPEND qt_cmake_path ".bat") set(script_passed_args "${common_args} %*") endif() - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-internal-configure-tests.in" - "${QT_BUILD_DIR}/${INSTALL_BINDIR}/${script_name}") - qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/${script_name}" - DESTINATION "${INSTALL_BINDIR}") + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libexec/qt-internal-configure-tests.in" + "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/${script_name}") + qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/${script_name}" + DESTINATION "${INSTALL_LIBEXECDIR}") endfunction() function(qt_internal_install_android_helper_scripts) diff --git a/coin/instructions/call_cmake_for_standalone_tests.yaml b/coin/instructions/call_cmake_for_standalone_tests.yaml index 7b78eee8c8d..9b7b9ad1419 100644 --- a/coin/instructions/call_cmake_for_standalone_tests.yaml +++ b/coin/instructions/call_cmake_for_standalone_tests.yaml @@ -14,7 +14,7 @@ instructions: property: host.os equals_value: Windows - type: ExecuteCommand - command: "{{.Env.TESTS_ENV_PREFIX}} {{.Env.INSTALL_DIR_FOR_CMAKE_TESTS}}/bin/qt-internal-configure-tests {{.Env.COIN_CMAKE_ARGS}}" + command: "{{.Env.TESTS_ENV_PREFIX}} {{.Env.INSTALL_DIR_FOR_CMAKE_TESTS}}/libexec/qt-internal-configure-tests {{.Env.COIN_CMAKE_ARGS}}" executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution maxTimeInSeconds: 6000 maxTimeBetweenOutput: 1200 diff --git a/bin/qt-internal-configure-tests.in b/libexec/qt-internal-configure-tests.in similarity index 100% rename from bin/qt-internal-configure-tests.in rename to libexec/qt-internal-configure-tests.in