CMake: Provide a qt-internal-configure-tests script
This is meant to be called by our CI instructions to build standalone tests of a Qt repository. Currently it just calls qt-cmake with -DQT_BUILD_STANDALONE_TESTS=ON, but it might contain more things in the future. The script also simplifies configuring standalone tests locally, due to not having to remember the name of the magical variable. Change our CI instructions to use the new script. Change-Id: I6bc02b4e94adc9d0d05fecb0fe70a561043271f1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
parent
c8d42961a0
commit
bcc7d34540
3
bin/qt-internal-configure-tests.in
Executable file
3
bin/qt-internal-configure-tests.in
Executable file
@ -0,0 +1,3 @@
|
|||||||
|
@script_os_prelude@
|
||||||
|
|
||||||
|
@qt_cmake_path@ @script_passed_args@
|
@ -108,4 +108,36 @@ function(qt_internal_create_wrapper_scripts)
|
|||||||
"${QT_BUILD_DIR}/${INSTALL_BINDIR}/${__qt_cmake_install_script_name}" @ONLY)
|
"${QT_BUILD_DIR}/${INSTALL_BINDIR}/${__qt_cmake_install_script_name}" @ONLY)
|
||||||
qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/${__qt_cmake_install_script_name}"
|
qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/${__qt_cmake_install_script_name}"
|
||||||
DESTINATION "${INSTALL_BINDIR}")
|
DESTINATION "${INSTALL_BINDIR}")
|
||||||
|
|
||||||
|
qt_internal_create_qt_configure_tests_wrapper_script()
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
function(qt_internal_create_qt_configure_tests_wrapper_script)
|
||||||
|
# Create a private wrapper script to configure and build all standalone tests.
|
||||||
|
#
|
||||||
|
# The script uses qt-cmake instead of qt-cmake-private on purpose. That's to ensure we build
|
||||||
|
# only one configuration of tests (e.g RelWithDebInfo only) when Qt is configured with more
|
||||||
|
# than one configuration (RelWithDebInfo;Debug).
|
||||||
|
# Meant to be used by our CI instructions.
|
||||||
|
#
|
||||||
|
# The script takes a path to the repo for which the standalone tests will be configured.
|
||||||
|
set(script_name "qt-internal-configure-tests")
|
||||||
|
set(qt_cmake_path
|
||||||
|
"${QT_STAGING_PREFIX}/${INSTALL_BINDIR}/qt-cmake")
|
||||||
|
|
||||||
|
set(common_args "-DQT_BUILD_STANDALONE_TESTS=ON")
|
||||||
|
if(CMAKE_HOST_UNIX)
|
||||||
|
set(script_os_prelude "#!/bin/sh")
|
||||||
|
string(PREPEND qt_cmake_path "exec ")
|
||||||
|
set(script_passed_args "${common_args} \"$@\"")
|
||||||
|
else()
|
||||||
|
set(script_os_prelude "@echo off")
|
||||||
|
string(APPEND script_name ".bat")
|
||||||
|
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}")
|
||||||
endfunction()
|
endfunction()
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
type: Group
|
type: Group
|
||||||
instructions:
|
instructions:
|
||||||
- type: ExecuteCommand
|
- type: ExecuteCommand
|
||||||
command: "{{.Env.TESTS_ENV_PREFIX}} {{.Env.INSTALL_DIR_FOR_CMAKE_TESTS}}\\bin\\qt-cmake {{.Env.COIN_CMAKE_ARGS}}"
|
command: "{{.Env.TESTS_ENV_PREFIX}} {{.Env.INSTALL_DIR_FOR_CMAKE_TESTS}}\\bin\\qt-internal-configure-tests {{.Env.COIN_CMAKE_ARGS}}"
|
||||||
executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
|
executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
|
||||||
maxTimeInSeconds: 6000
|
maxTimeInSeconds: 6000
|
||||||
maxTimeBetweenOutput: 1200
|
maxTimeBetweenOutput: 1200
|
||||||
@ -12,7 +12,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-cmake {{.Env.COIN_CMAKE_ARGS}}"
|
command: "{{.Env.TESTS_ENV_PREFIX}} {{.Env.INSTALL_DIR_FOR_CMAKE_TESTS}}/bin/qt-internal-configure-tests {{.Env.COIN_CMAKE_ARGS}}"
|
||||||
executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
|
executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
|
||||||
maxTimeInSeconds: 6000
|
maxTimeInSeconds: 6000
|
||||||
maxTimeBetweenOutput: 1200
|
maxTimeBetweenOutput: 1200
|
||||||
|
@ -10,14 +10,14 @@ instructions:
|
|||||||
directory: "{{.BuildDir}}"
|
directory: "{{.BuildDir}}"
|
||||||
- type: AppendToEnvironmentVariable
|
- type: AppendToEnvironmentVariable
|
||||||
variableName: COIN_CMAKE_ARGS
|
variableName: COIN_CMAKE_ARGS
|
||||||
variableValue: " -DQT_BUILD_STANDALONE_TESTS=ON -DCMAKE_AUTOGEN_VERBOSE=ON -S {{.SourceDir}} -B ."
|
variableValue: " -DCMAKE_AUTOGEN_VERBOSE=ON -S {{.SourceDir}} -B ."
|
||||||
disable_if:
|
disable_if:
|
||||||
condition: runtime
|
condition: runtime
|
||||||
env_var: COIN_CMAKE_ARGS
|
env_var: COIN_CMAKE_ARGS
|
||||||
equals_value: null
|
equals_value: null
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: COIN_CMAKE_ARGS
|
variableName: COIN_CMAKE_ARGS
|
||||||
variableValue: "-DQT_BUILD_STANDALONE_TESTS=ON -DCMAKE_AUTOGEN_VERBOSE=ON -S {{.SourceDir}} -B ."
|
variableValue: "-DCMAKE_AUTOGEN_VERBOSE=ON -S {{.SourceDir}} -B ."
|
||||||
enable_if:
|
enable_if:
|
||||||
condition: runtime
|
condition: runtime
|
||||||
env_var: COIN_CMAKE_ARGS
|
env_var: COIN_CMAKE_ARGS
|
||||||
|
Loading…
x
Reference in New Issue
Block a user