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>
This commit is contained in:
parent
31c81e08c6
commit
4ae9922166
@ -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)
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user