From cbc1e740d34c2b4b98faa4a8d6b7f7b947a9e1e6 Mon Sep 17 00:00:00 2001
From: juergen <juergen@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Tue, 11 May 2010 15:30:10 +0000
Subject: [PATCH] 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
---
cmake_support/OST.cmake | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/cmake_support/OST.cmake b/cmake_support/OST.cmake
index 6d04eb292..f3d23fbb6 100644
--- a/cmake_support/OST.cmake
+++ b/cmake_support/OST.cmake
@@ -496,7 +496,7 @@ macro(ost_unittest MODULE SOURCE_FILES)
target_link_libraries(${_test_name} ${BOOST_UNIT_TEST_LIBRARIES}
"ost_${MODULE}")
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}
COMMENT "running checks for module ${MODULE}"
DEPENDS ${_test_name})
@@ -513,13 +513,17 @@ macro(ost_unittest MODULE SOURCE_FILES)
foreach(py_test ${PY_TESTS})
if(WIN32)
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()
set (PY_TESTS_CMD "${EXECUTABLE_OUTPUT_PATH}/ost")
- endif()
- add_custom_target("${py_test}_run"
- COMMAND ${PY_TESTS_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/${py_test} || echo
+ add_custom_target("${py_test}_run"
+ sh -c "${PY_TESTS_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/${py_test} || echo"
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(check "${py_test}_run")
if (WIN32)
@@ -626,4 +630,4 @@ macro(get_ost_rev)
endif()
endif()
message("Revision: ${OST_REV}")
-endmacro()
\ No newline at end of file
+endmacro()
--
GitLab