Skip to content
Snippets Groups Projects
Commit 2d7dc0f0 authored by Graeme A Stewart's avatar Graeme A Stewart
Browse files

Fixes for CI with toolchains

Helper scripts to prepare the environment for execution to be consistent with
what the toolchain provided (Marco)
parent d6474933
No related branches found
No related tags found
1 merge request!1418Updates for python3 "native"
......@@ -76,15 +76,11 @@ elseif(DEFINED TEST_INSTALLATION_LAYOUT)
message(FATAL_ERROR "Scripts are not installed")
endif()
# try to execute
execute_process(COMMAND ${CMAKE_COMMAND} -E env LD_LIBRARY_PATH=${BIN_DIR}/${INSTALL_DIR}/lib:$ENV{LD_LIBRARY_PATH}
${BIN_DIR}/${INSTALL_DIR}/bin/qux
RESULT_VARIABLE returned_value)
execute_process(COMMAND qux RESULT_VARIABLE returned_value)
if(NOT returned_value EQUAL "0")
message(FATAL_ERROR "Cannot run the executable qux or something went wrong.")
endif()
execute_process(COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${BIN_DIR}/${INSTALL_DIR}/python:$ENV{PYTHONPATH}
${BIN_DIR}/${INSTALL_DIR}/bin/dummyRun.py
RESULT_VARIABLE returned_value)
execute_process(COMMAND dummyRun.py RESULT_VARIABLE returned_value)
if(NOT returned_value EQUAL "0")
message(FATAL_ERROR "Cannot run the script dummyRun.py.")
endif()
......@@ -157,7 +153,9 @@ else()
DEPENDS cmake.test_dummyProject_install
FIXTURES_REQUIRED cmake.test_dummyProject_install
FIXTURES_SETUP cmake.test_dummyProject_install_checks
LABELS CMake)
LABELS CMake
ENVIRONMENT "PATH=${CMAKE_CURRENT_BINARY_DIR}/dummyProjectBinaryDir/install/bin:$ENV{PATH};LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/dummyProjectBinaryDir/install/lib:$ENV{LD_LIBRARY_PATH};PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}/dummyProjectBinaryDir/python:${CMAKE_SOURCE_DIR}/cmake/tests/dummyProject/python:$ENV{PYTHONPATH}"
)
endif()
cmake_policy(POP)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment