edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Call net_init in tests

Browse source
This commit is contained in:
heinrich5991 2017-11-24 10:51:46 +01:00
parent 3f43624d21
commit 23734deb14
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -270,12 +270,10 @@ if(NOT(GTEST_FOUND) AND DOWNLOAD_GTEST)
message(FATAL_ERROR "Build step for googletest failed: ${result}")
endif()
# Prevent overriding the parent project's compiler/linker
# settings on Windows
# Prevent overriding the parent project's compiler/linker settings on Windows
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
# Add googletest directly to our build. This defines
# the gtest and gtest_main targets.
# Add googletest directly to our build. This defines the gtest target.
add_subdirectory(
${CMAKE_BINARY_DIR}/googletest-src
${CMAKE_BINARY_DIR}/googletest-build
@ -283,12 +281,12 @@ if(NOT(GTEST_FOUND) AND DOWNLOAD_GTEST)
)
if(MSVC)
foreach(target gtest gtest_main)
foreach(target gtest)
target_compile_options(${target} PRIVATE $<$<NOT:${DBG}>:/MT> $<${DBG}:/MTd>)
endforeach()
endif()
set(GTEST_BOTH_LIBRARIES gtest_main)
set(GTEST_LIBRARIES gtest)
set(GTEST_INCLUDE_DIRS)
if(CMAKE_VERSION VERSION_LESS 2.8.11)
set(GTEST_INCLUDE_DIRS "${gtest_SOURCE_DIR}/include")
@ -1025,7 +1023,7 @@ if(GTEST_FOUND OR DOWNLOAD_GTEST)
$<TARGET_OBJECTS:game-shared>
${DEPS}
)
target_link_libraries(${TARGET_TESTRUNNER} ${LIBS} ${GTEST_BOTH_LIBRARIES})
target_link_libraries(${TARGET_TESTRUNNER} ${LIBS} ${GTEST_LIBRARIES})
target_include_directories(${TARGET_TESTRUNNER} PRIVATE ${GTEST_INCLUDE_DIRS})
list(APPEND TARGETS_OWN ${TARGET_TESTRUNNER})

7
src/test/test.cpp
View file

@ -10,3 +10,10 @@ CTestInfo::CTestInfo()
str_format(m_aFilename, sizeof(m_aFilename), "%s.%s-%d.tmp",
pTestInfo->test_case_name(), pTestInfo->name(), pid());
}
int main(int argc, char **argv)
{
::testing::InitGoogleTest(&argc, argv);
net_init();
return RUN_ALL_TESTS();
}