Commit 2aedb1b6 authored by Laurent Claustre's avatar Laurent Claustre

Merge branch '37-add-missing-tests-of-simulator-on-windows' into 'master'

Resolve "Add missing tests of simulator on Windows"

Closes #37

See merge request !56
parents d6ecb566 b9151873
Pipeline #3186 passed with stages
in 1 minute and 40 seconds
......@@ -20,10 +20,8 @@
# along with this program; if not, see <http://www.gnu.org/licenses/>.
############################################################################
set(test_src test_simulator)
if (NOT WIN32)
set(test_src ${test_src} test_simulator_hwbuffersave test_simulator_framebuilder)
endif()
set(test_src test_simulator test_simulator_hwbuffersave test_simulator_framebuilder)
limatools_run_camera_tests("${test_src}" ${NAME})
set(python_test_src test_prepare_timeout)
......
......@@ -42,6 +42,11 @@ function(limatools_run_camera_tests test_src cam_name)
add_executable(${file} "${file}.cpp")
target_link_libraries(${file} limacore lima${cam_name})
add_test(NAME ${file} COMMAND ${file} ${test_arg})
if(WIN32)
# Add the dlls to the %PATH%
string(REPLACE ";" "\;" ESCAPED_PATH "$ENV{PATH}")
set_tests_properties(${file} PROPERTIES ENVIRONMENT "PATH=${ESCAPED_PATH}\;$<SHELL_PATH:$<TARGET_FILE_DIR:limacore>>\;$<SHELL_PATH:$<TARGET_FILE_DIR:processlib>>\;$<SHELL_PATH:$<TARGET_FILE_DIR:lima${cam_name}>>")
endif()
endforeach(file)
endfunction()
......
......@@ -108,9 +108,9 @@ Exception& Exception::operator <<(const T& o)
}
std::ostream& operator <<(std::ostream& os, Layer layer);
std::ostream& operator <<(std::ostream& os, ErrorType err_type);
std::ostream& operator <<(std::ostream& os, const Exception& e);
LIMACORE_API std::ostream& operator <<(std::ostream& os, Layer layer);
LIMACORE_API std::ostream& operator <<(std::ostream& os, ErrorType err_type);
LIMACORE_API std::ostream& operator <<(std::ostream& os, const Exception& e);
#define LIMA_EXC(layer, err_type, err_desc) \
Exception(layer, err_type, err_desc, __FILE__, __FUNCTION__, __LINE__,\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment