From ca82353e81988b4c4105ef2ed8d61206a70d6595 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Mon, 18 Nov 2013 16:13:19 +0100 Subject: Re-enable profile_test test --- test/unit/common/CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'test/unit/common') diff --git a/test/unit/common/CMakeLists.txt b/test/unit/common/CMakeLists.txt index aebf17a..7d1ae9d 100644 --- a/test/unit/common/CMakeLists.txt +++ b/test/unit/common/CMakeLists.txt @@ -10,7 +10,10 @@ target_link_libraries(image_test ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${PNG_LIBRAR file(COPY colobot.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -# add_executable(profile_test ${SRC_DIR}/common/profile.cpp ${SRC_DIR}/common/logger.cpp profile_test.cpp) -# target_link_libraries(profile_test gtest ${Boost_LIBRARIES}) +add_executable(profile_test ${SRC_DIR}/common/profile.cpp ${SRC_DIR}/common/logger.cpp profile_test.cpp) +set_target_properties(profile_test PROPERTIES COMPILE_DEFINITIONS "DEV_BUILD=1") +target_link_libraries(profile_test gtest ${Boost_LIBRARIES}) -# add_test(profile_test ./profile_test) +add_test(NAME profile_test + COMMAND ${CMAKE_BINARY_DIR}/profile_test + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) -- cgit v1.2.3-1-g7c22 From 86c0eb193dc84d39056e9a581f0717a058614db1 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Mon, 18 Nov 2013 16:24:41 +0100 Subject: Run image_test --- test/unit/common/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'test/unit/common') diff --git a/test/unit/common/CMakeLists.txt b/test/unit/common/CMakeLists.txt index 7d1ae9d..cf37961 100644 --- a/test/unit/common/CMakeLists.txt +++ b/test/unit/common/CMakeLists.txt @@ -7,6 +7,8 @@ ${GTEST_INCLUDE_DIR} add_executable(image_test ${SRC_DIR}/common/image.cpp image_test.cpp) target_link_libraries(image_test ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${PNG_LIBRARIES}) +add_test(NAME image_test + COMMAND ${CMAKE_BINARY_DIR}/image_test ${CMAKE_SOURCE_DIR}/test/envs/opengl/tex1.png ${CMAKE_BINARY_DIR}/tex1_test.png) file(COPY colobot.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -- cgit v1.2.3-1-g7c22