1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1617112958

Browse Source
This commit is contained in:
Qt CI Bot 2021-03-30 16:45:45 +00:00
commit 18b9b5c560
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/QtWrapperScriptHelpers.cmake
View File

@ -152,10 +152,10 @@ function(qt_internal_create_qt_configure_tests_wrapper_script)
string(APPEND qt_cmake_path ".bat") string(APPEND qt_cmake_path ".bat")
set(script_passed_args "${common_args} %*") set(script_passed_args "${common_args} %*")
endif() endif()
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-internal-configure-tests.in" configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libexec/qt-internal-configure-tests.in"
"${QT_BUILD_DIR}/${INSTALL_BINDIR}/${script_name}") "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/${script_name}")
qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/${script_name}" qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/${script_name}"
DESTINATION "${INSTALL_BINDIR}") DESTINATION "${INSTALL_LIBEXECDIR}")
endfunction() endfunction()
function(qt_internal_install_android_helper_scripts) function(qt_internal_install_android_helper_scripts)

2
coin/instructions/call_cmake_for_standalone_tests.yaml
View File

@ -14,7 +14,7 @@ instructions:
property: host.os property: host.os
equals_value: Windows equals_value: Windows
- type: ExecuteCommand - 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 executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
maxTimeInSeconds: 6000 maxTimeInSeconds: 6000
maxTimeBetweenOutput: 1200 maxTimeBetweenOutput: 1200

0
bin/qt-internal-configure-tests.in → libexec/qt-internal-configure-tests.in
View File