Skip to content
Snippets Groups Projects
Commit cbc1e740 authored by juergen's avatar juergen
Browse files

fixing escaping bug for python unit tests on some systems

git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2242 5a81b35b-ba03-0410-adc8-b2c5c5119f08
parent c067b6ba
No related branches found
No related tags found
No related merge requests found
...@@ -496,7 +496,7 @@ macro(ost_unittest MODULE SOURCE_FILES) ...@@ -496,7 +496,7 @@ macro(ost_unittest MODULE SOURCE_FILES)
target_link_libraries(${_test_name} ${BOOST_UNIT_TEST_LIBRARIES} target_link_libraries(${_test_name} ${BOOST_UNIT_TEST_LIBRARIES}
"ost_${MODULE}") "ost_${MODULE}")
add_custom_target("${_test_name}_run" add_custom_target("${_test_name}_run"
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${_test_name} || echo COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${_test_name} || echo
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "running checks for module ${MODULE}" COMMENT "running checks for module ${MODULE}"
DEPENDS ${_test_name}) DEPENDS ${_test_name})
...@@ -513,13 +513,17 @@ macro(ost_unittest MODULE SOURCE_FILES) ...@@ -513,13 +513,17 @@ macro(ost_unittest MODULE SOURCE_FILES)
foreach(py_test ${PY_TESTS}) foreach(py_test ${PY_TESTS})
if(WIN32) if(WIN32)
set (PY_TESTS_CMD "${EXECUTABLE_OUTPUT_PATH}/ost.bat") set (PY_TESTS_CMD "${EXECUTABLE_OUTPUT_PATH}/ost.bat")
add_custom_target("${py_test}_run"
CALL "${PY_TESTS_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/${py_test} || echo"
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "running checks ${py_test}" VERBATIM)
else() else()
set (PY_TESTS_CMD "${EXECUTABLE_OUTPUT_PATH}/ost") set (PY_TESTS_CMD "${EXECUTABLE_OUTPUT_PATH}/ost")
endif() add_custom_target("${py_test}_run"
add_custom_target("${py_test}_run" sh -c "${PY_TESTS_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/${py_test} || echo"
COMMAND ${PY_TESTS_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/${py_test} || echo
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "running checks ${py_test}" VERBATIM) COMMENT "running checks ${py_test}" VERBATIM)
endif()
add_dependencies("${py_test}_run" ost_scripts "_${MODULE}") add_dependencies("${py_test}_run" ost_scripts "_${MODULE}")
add_dependencies(check "${py_test}_run") add_dependencies(check "${py_test}_run")
if (WIN32) if (WIN32)
...@@ -626,4 +630,4 @@ macro(get_ost_rev) ...@@ -626,4 +630,4 @@ macro(get_ost_rev)
endif() endif()
endif() endif()
message("Revision: ${OST_REV}") message("Revision: ${OST_REV}")
endmacro() endmacro()
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment