OCT 1. 重新整理单元测试目录结构

CMakeLists.txt

@@ -111,3 +111,8 @@ ENDIF ()
 ADD_SUBDIRECTORY(srcs)
 ADD_SUBDIRECTORY(srcs/libs)
 ADD_SUBDIRECTORY(srcs/httpserver)
+
+IF (BUILD_TESTING)
+    ADD_SUBDIRECTORY(test)
+    ADD_SUBDIRECTORY(srcs/libs/unit_test)
+ENDIF ()

srcs/libs/CMakeLists.txt

@@ -61,7 +61,3 @@ IF (USED_OPENDHCPD)
 ENDIF ()
 
 TARGET_INCLUDE_DIRECTORIES(${LIB_PROJECT_TARGET} PUBLIC ${PROJECT_BINARY_DIR}/ ${CMAKE_BINARY_DIR}/)
-
-IF (BUILD_TESTING)
-    ADD_SUBDIRECTORY(unit_test)
-ENDIF ()

srcs/libs/unit_test/CMakeLists.txt

@@ -1,6 +1,6 @@
 PROJECT(libcommon_utest)
 
-INCLUDE_DIRECTORIES(./ ../include ../../include)
+INCLUDE_DIRECTORIES(./ ../include ../../include ../../test)
 
 AUX_SOURCE_DIRECTORY(misc UTEST_SRC)
 

srcs/libs/unit_test/misc/uuid_test.cpp

@@ -3,7 +3,7 @@
 //
 // provides main(); this line is required in only one .cpp file
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "../doctest.h"
+#include "doctest.h"
 
 #include "uuid.h"
 

test/CMakeLists.txt

@@ -0,0 +1,3 @@
+PROJECT(vcpe_utest)
+
+INCLUDE_DIRECTORIES(./ ../srcs/include ../srcs/libs/include)