Skip to content
Snippets Groups Projects
Commit d927d7a7 authored by Tobias Schmidt's avatar Tobias Schmidt
Browse files

add cmake target check_xml, which writes XML output for all testcases

parent 13684496
Branches
Tags
No related merge requests found
...@@ -586,6 +586,7 @@ macro(pymod) ...@@ -586,6 +586,7 @@ macro(pymod)
endmacro() endmacro()
add_custom_target(check) add_custom_target(check)
add_custom_target(check_xml)
if (WIN32) if (WIN32)
set_target_properties(check PROPERTIES EXCLUDE_FROM_ALL "1") set_target_properties(check PROPERTIES EXCLUDE_FROM_ALL "1")
endif() endif()
...@@ -630,7 +631,12 @@ macro(ost_unittest) ...@@ -630,7 +631,12 @@ macro(ost_unittest)
target_link_libraries(${_test_name} ${BOOST_UNIT_TEST_LIBRARIES} target_link_libraries(${_test_name} ${BOOST_UNIT_TEST_LIBRARIES}
"${_ARG_PREFIX}_${_ARG_MODULE}") "${_ARG_PREFIX}_${_ARG_MODULE}")
add_custom_target("${_test_name}_run" add_custom_target("${_test_name}_run"
COMMAND OST_ROOT=${STAGE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/${_test_name} || echo COMMAND OST_ROOT=${STAGE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/${_test_name} || echo
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "running checks for module ${_ARG_MODULE}"
DEPENDS ${_test_name})
add_custom_target("${_test_name}_run_xml"
COMMAND OST_ROOT=${STAGE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/${_test_name} --log_format=xml --log_level=all > ${_test_name}_log.xml || echo
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "running checks for module ${_ARG_MODULE}" COMMENT "running checks for module ${_ARG_MODULE}"
DEPENDS ${_test_name}) DEPENDS ${_test_name})
...@@ -642,6 +648,7 @@ macro(ost_unittest) ...@@ -642,6 +648,7 @@ macro(ost_unittest)
endif() endif()
add_dependencies(check "${_test_name}_run") add_dependencies(check "${_test_name}_run")
add_dependencies(check_xml "${_test_name}_run_xml")
set_target_properties(${_test_name} set_target_properties(${_test_name}
PROPERTIES RUNTIME_OUTPUT_DIRECTORY PROPERTIES RUNTIME_OUTPUT_DIRECTORY
"${CMAKE_CURRENT_BINARY_DIR}") "${CMAKE_CURRENT_BINARY_DIR}")
...@@ -662,9 +669,15 @@ macro(ost_unittest) ...@@ -662,9 +669,15 @@ macro(ost_unittest)
sh -c "${PY_TESTS_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/${py_test} || echo" sh -c "${PY_TESTS_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/${py_test} || echo"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "running checks ${py_test}" VERBATIM) COMMENT "running checks ${py_test}" VERBATIM)
add_custom_target("${py_test}_run_xml"
sh -c "${PY_TESTS_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/${py_test} xml || echo"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "running checks ${py_test}" VERBATIM)
endif() endif()
add_dependencies("${py_test}_run" ost_scripts "_${_ARG_PREFIX}_${_ARG_MODULE}") add_dependencies("${py_test}_run" ost_scripts "_${_ARG_PREFIX}_${_ARG_MODULE}")
add_dependencies("${py_test}_run_xml" ost_scripts "_${_ARG_PREFIX}_${_ARG_MODULE}")
add_dependencies(check "${py_test}_run") add_dependencies(check "${py_test}_run")
add_dependencies(check_xml "${py_test}_run_xml")
if (WIN32) if (WIN32)
set_target_properties("${py_test}_run" PROPERTIES EXCLUDE_FROM_ALL "1") set_target_properties("${py_test}_run" PROPERTIES EXCLUDE_FROM_ALL "1")
endif() endif()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment