diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-03-23 16:30:03 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-03-30 14:39:12 +0100 |
| commit | 4ae9922166ba81c9efea5b2af29898eb20a1fd63 (patch) | |
| tree | ea8c5394a9526efe9893d03141a54b52488b5f27 | |
| parent | 31c81e08c6b0fa878ab7a22771230635ac2e85c6 (diff) | |
Move bin/qt-internal-configure-tests to libexec
Pick-to: 6.1
Task-number: QTBUG-88791
Change-Id: I78613128760b5820e6db17b0c09462e34f7c7bb2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | cmake/QtWrapperScriptHelpers.cmake | 8 | ||||
| -rw-r--r-- | coin/instructions/call_cmake_for_standalone_tests.yaml | 2 | ||||
| -rwxr-xr-x | libexec/qt-internal-configure-tests.in (renamed from bin/qt-internal-configure-tests.in) | 0 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cmake/QtWrapperScriptHelpers.cmake b/cmake/QtWrapperScriptHelpers.cmake index 15b0ca9eca..14958d2ce6 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 7b78eee8c8..9b7b9ad141 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 index 396cda7bf8..396cda7bf8 100755 --- a/bin/qt-internal-configure-tests.in +++ b/libexec/qt-internal-configure-tests.in |