Merge branch 'build-rawmodel' into develop

cmake_support/PROMOD3.cmake

@@ -670,7 +670,7 @@ macro(promod3_unittest)
                           "${_ARG_PREFIX}_${_ARG_MODULE}")
       add_custom_target("${_test_name}_run"
                       COMMAND
-     PROMOD3_ROOT=${STAGE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/${_test_name} || echo
+             PROMOD3_ROOT=${STAGE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/${_test_name}
                       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
                       COMMENT "running checks for module ${_ARG_MODULE}"
                       DEPENDS ${_test_name})
@@ -679,6 +679,9 @@ macro(promod3_unittest)
       set(_xml_test_cmd ${_xml_test_cmd} ${CMAKE_CURRENT_BINARY_DIR})
       set(_xml_test_cmd "${_xml_test_cmd}/${_test_name}")
       set(_xml_test_cmd ${_xml_test_cmd} "--log_format=xml" "--log_level=all")
+      # XML test outputgets an logical OR to 'echo' so if sth fails, make
+      # continues and we get output for all unit tests. Just calling 'echo'
+      # giveth $?=0.
       add_custom_target("${_test_name}_run_xml"
                       COMMAND ${_xml_test_cmd} > ${_test_name}_log.xml || echo
                       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
@@ -709,11 +712,14 @@ macro(promod3_unittest)
    "${python_path}${OST_ROOT}/${LIB_DIR}/python${PYTHON_VERSION}/site-packages")
       set (PY_TESTS_CMD "PYTHONPATH=${python_path}  ${PYTHON_BINARY}")
       add_custom_target("${py_test}_run"
-          sh -c "${PY_TESTS_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/${py_test} || echo"
+                  sh -c "${PY_TESTS_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/${py_test}"
                 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
                 COMMENT "running checks ${py_test}" VERBATIM)
       add_dependencies("${py_test}_run" "test_data_${_ARG_MODULE}")
       add_dependencies("${py_test}_run" "_${_ARG_MODULE}")
+      # XML test outputgets an logical OR to 'echo' so if sth fails, make
+      # continues and we get output for all unit tests. Just calling 'echo'
+      # giveth $?=0.
       add_custom_target("${py_test}_run_xml"
       sh -c "${PY_TESTS_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/${py_test} xml || echo"
                 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}