Move test cases to test dir

src/packet/CMakeLists.txt

@@ -8,18 +8,4 @@ target_include_directories(packet PUBLIC ${CMAKE_SOURCE_DIR}/src/tuple)
 target_include_directories(packet PUBLIC ${CMAKE_SOURCE_DIR}/deps/uthash)
 target_link_libraries(packet tuple)
 
-###############################################################################
+add_subdirectory(test)
-# gtest
-###############################################################################
-
-add_executable(gtest_packet gtest_packet.cpp)
-target_include_directories(gtest_packet PUBLIC ${CMAKE_CURRENT_LIST_DIR})
-target_link_libraries(gtest_packet packet gtest)
-
-add_executable(gtest_packet_helpers gtest_packet_helpers.cpp)
-target_include_directories(gtest_packet_helpers PUBLIC ${CMAKE_CURRENT_LIST_DIR})
-target_link_libraries(gtest_packet_helpers packet gtest)
-
-include(GoogleTest)
-gtest_discover_tests(gtest_packet)
-gtest_discover_tests(gtest_packet_helpers)

src/packet/test/CMakeLists.txt

@@ -0,0 +1,15 @@
+###############################################################################
+# gtest
+###############################################################################
+
+add_executable(gtest_packet gtest_packet.cpp)
+target_include_directories(gtest_packet PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_link_libraries(gtest_packet packet gtest)
+
+add_executable(gtest_packet_helpers gtest_packet_helpers.cpp)
+target_include_directories(gtest_packet_helpers PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_link_libraries(gtest_packet_helpers packet gtest)
+
+include(GoogleTest)
+gtest_discover_tests(gtest_packet)
+gtest_discover_tests(gtest_packet_helpers)

src/session/CMakeLists.txt

@@ -18,38 +18,4 @@ target_include_directories(session_manager PUBLIC ${CMAKE_SOURCE_DIR}/src/timest
 target_include_directories(session_manager PUBLIC ${CMAKE_SOURCE_DIR}/src/tuple)
 target_link_libraries(session_manager timeout timestamp tuple packet)
 
-###############################################################################
+add_subdirectory(test)
-# gtest
-###############################################################################
-
-add_executable(gtest_session gtest_session.cpp)
-target_include_directories(gtest_session PUBLIC ${CMAKE_CURRENT_LIST_DIR})
-target_link_libraries(gtest_session session_manager gtest)
-
-add_executable(gtest_session_pool gtest_session_pool.cpp)
-target_include_directories(gtest_session_pool PUBLIC ${CMAKE_CURRENT_LIST_DIR})
-target_link_libraries(gtest_session_pool session_manager gtest)
-
-add_executable(gtest_session_table gtest_session_table.cpp)
-target_include_directories(gtest_session_table PUBLIC ${CMAKE_CURRENT_LIST_DIR})
-target_link_libraries(gtest_session_table session_manager gtest)
-
-add_executable(gtest_session_timer gtest_session_timer.cpp)
-target_include_directories(gtest_session_timer PUBLIC ${CMAKE_CURRENT_LIST_DIR})
-target_link_libraries(gtest_session_timer session_manager gtest)
-
-add_executable(gtest_session_queue gtest_session_queue.cpp)
-target_include_directories(gtest_session_queue PUBLIC ${CMAKE_CURRENT_LIST_DIR})
-target_link_libraries(gtest_session_queue session_manager gtest)
-
-add_executable(gtest_session_manager gtest_session_manager.cpp)
-target_include_directories(gtest_session_manager PUBLIC ${CMAKE_CURRENT_LIST_DIR})
-target_link_libraries(gtest_session_manager session_manager gtest)
-
-include(GoogleTest)
-gtest_discover_tests(gtest_session)
-gtest_discover_tests(gtest_session_pool)
-gtest_discover_tests(gtest_session_table)
-gtest_discover_tests(gtest_session_timer)
-gtest_discover_tests(gtest_session_queue)
-gtest_discover_tests(gtest_session_manager)

src/session/test/CMakeLists.txt

@@ -0,0 +1,35 @@
+###############################################################################
+# gtest
+###############################################################################
+
+add_executable(gtest_session gtest_session.cpp)
+target_include_directories(gtest_session PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_link_libraries(gtest_session session_manager gtest)
+
+add_executable(gtest_session_pool gtest_session_pool.cpp)
+target_include_directories(gtest_session_pool PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_link_libraries(gtest_session_pool session_manager gtest)
+
+add_executable(gtest_session_table gtest_session_table.cpp)
+target_include_directories(gtest_session_table PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_link_libraries(gtest_session_table session_manager gtest)
+
+add_executable(gtest_session_timer gtest_session_timer.cpp)
+target_include_directories(gtest_session_timer PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_link_libraries(gtest_session_timer session_manager gtest)
+
+add_executable(gtest_session_queue gtest_session_queue.cpp)
+target_include_directories(gtest_session_queue PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_link_libraries(gtest_session_queue session_manager gtest)
+
+add_executable(gtest_session_manager gtest_session_manager.cpp)
+target_include_directories(gtest_session_manager PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_link_libraries(gtest_session_manager session_manager gtest)
+
+include(GoogleTest)
+gtest_discover_tests(gtest_session)
+gtest_discover_tests(gtest_session_pool)
+gtest_discover_tests(gtest_session_table)
+gtest_discover_tests(gtest_session_timer)
+gtest_discover_tests(gtest_session_queue)
+gtest_discover_tests(gtest_session_manager)

src/timestamp/CMakeLists.txt

@@ -6,13 +6,4 @@ add_library(timestamp timestamp.cpp)
 target_include_directories(timestamp PUBLIC ${CMAKE_SOURCE_DIR}/src/timestamp)
 target_link_libraries(timestamp)
 
-###############################################################################
+add_subdirectory(test)
-# gtest
-###############################################################################
-
-add_executable(gtest_timestamp gtest_timestamp.cpp)
-target_include_directories(gtest_timestamp PUBLIC ${CMAKE_CURRENT_LIST_DIR})
-target_link_libraries(gtest_timestamp timestamp gtest)
-
-include(GoogleTest)
-gtest_discover_tests(gtest_timestamp)

src/timestamp/test/CMakeLists.txt

@@ -0,0 +1,10 @@
+###############################################################################
+# gtest
+###############################################################################
+
+add_executable(gtest_timestamp gtest_timestamp.cpp)
+target_include_directories(gtest_timestamp PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_link_libraries(gtest_timestamp timestamp gtest)
+
+include(GoogleTest)
+gtest_discover_tests(gtest_timestamp)

src/tuple/CMakeLists.txt

@@ -7,13 +7,4 @@ target_include_directories(tuple PUBLIC ${CMAKE_SOURCE_DIR}/src/tuple)
 target_include_directories(tuple PUBLIC ${CMAKE_SOURCE_DIR}/src/crc32)
 target_link_libraries(tuple)
 
-###############################################################################
+add_subdirectory(test)
-# gtest
-###############################################################################
-
-add_executable(gtest_tuple gtest_tuple.cpp)
-target_include_directories(gtest_tuple PUBLIC ${CMAKE_CURRENT_LIST_DIR})
-target_link_libraries(gtest_tuple tuple gtest)
-
-include(GoogleTest)
-gtest_discover_tests(gtest_tuple)

src/tuple/test/CMakeLists.txt

@@ -0,0 +1,10 @@
+###############################################################################
+# gtest
+###############################################################################
+
+add_executable(gtest_tuple gtest_tuple.cpp)
+target_include_directories(gtest_tuple PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_link_libraries(gtest_tuple tuple gtest)
+
+include(GoogleTest)
+gtest_discover_tests(gtest_tuple)