XiaoMi · qinzuoyan · Jul 9, 2019 · Jul 6, 2019 · Jul 6, 2019
diff --git a/scripts/linux/build.sh b/scripts/linux/build.sh
@@ -175,7 +175,7 @@ echo "################################# start testing ##########################
 if [ -z "$TEST_MODULE" ]
 then
     # supported test module
-    TEST_MODULE="dsn.core.tests,dsn.tests,dsn_nfs_test,dsn.replication.simple_kv,dsn.rep_tests.simple_kv,dsn.meta.test,dsn.replica.test"
+    TEST_MODULE="dsn.core.tests,dsn.tests,dsn_nfs_test,dsn.replication.simple_kv,dsn.rep_tests.simple_kv,dsn.meta.test,dsn.replica.test,dsn_http_test"
 fi
 
 echo "TEST_MODULE=$TEST_MODULE"

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -11,6 +11,5 @@ add_library(dsn_runtime STATIC
         $<TARGET_OBJECTS:dsn.tools.common>
         $<TARGET_OBJECTS:dsn.tools.hpc>
         $<TARGET_OBJECTS:dsn.tools.simulator>
-        $<TARGET_OBJECTS:dsn.tools.http>
         )
 install(TARGETS dsn_runtime DESTINATION "lib")
diff --git a/src/core/tools/CMakeLists.txt b/src/core/tools/CMakeLists.txt
@@ -1,4 +1,3 @@
 add_subdirectory(common)
 add_subdirectory(simulator)
 add_subdirectory(hpc)
-add_subdirectory(http)
diff --git a/src/dist/CMakeLists.txt b/src/dist/CMakeLists.txt
@@ -4,3 +4,4 @@ add_subdirectory(failure_detector_multimaster)
 add_subdirectory(block_service)
 add_subdirectory(nfs)
 add_subdirectory(cli)
+add_subdirectory(http)
diff --git a/src/core/tools/http/CMakeLists.txt → src/dist/http/CMakeLists.txt b/src/core/tools/http/CMakeLists.txt → src/dist/http/CMakeLists.txt
@@ -1,9 +1,11 @@
-set(MY_PROJ_NAME dsn.tools.http)
+set(MY_PROJ_NAME dsn_http)
 
 set(MY_PROJ_SRC "")
 
 set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS "")
 
-dsn_add_object()
+dsn_add_static_library()
+
+add_subdirectory(test)
diff --git a/src/core/tools/http/http_message_parser.cpp → src/dist/http/http_message_parser.cpp b/src/core/tools/http/http_message_parser.cpp → src/dist/http/http_message_parser.cpp
diff --git a/src/core/tools/http/http_message_parser.h → src/dist/http/http_message_parser.h b/src/core/tools/http/http_message_parser.h → src/dist/http/http_message_parser.h
diff --git a/src/core/tools/http/http_parser.c → src/dist/http/http_parser.c b/src/core/tools/http/http_parser.c → src/dist/http/http_parser.c
diff --git a/src/core/tools/http/http_parser.h → src/dist/http/http_parser.h b/src/core/tools/http/http_parser.h → src/dist/http/http_parser.h
diff --git a/src/core/tools/http/http_server.cpp → src/dist/http/http_server.cpp b/src/core/tools/http/http_server.cpp → src/dist/http/http_server.cpp
diff --git a/src/core/tools/http/pprof_http_service.cpp → src/dist/http/pprof_http_service.cpp b/src/core/tools/http/pprof_http_service.cpp → src/dist/http/pprof_http_service.cpp
diff --git a/src/core/tools/http/pprof_http_service.h → src/dist/http/pprof_http_service.h b/src/core/tools/http/pprof_http_service.h → src/dist/http/pprof_http_service.h
diff --git a/src/core/tools/http/root_http_service.h → src/dist/http/root_http_service.h b/src/core/tools/http/root_http_service.h → src/dist/http/root_http_service.h
diff --git a/src/dist/http/test/CMakeLists.txt b/src/dist/http/test/CMakeLists.txt
@@ -0,0 +1,19 @@
+set(MY_PROJ_NAME dsn_http_test)
+
+set(MY_PROJ_SRC "")
+
+set(MY_SRC_SEARCH_MODE "GLOB")
+
+set(MY_PROJ_LIBS
+    dsn_http
+    gtest
+    gtest_main
+    )
+
+set(MY_BOOST_PACKAGES system filesystem)
+
+set(MY_BINPLACES
+    "${CMAKE_CURRENT_SOURCE_DIR}/run.sh"
+)
+
+dsn_add_test()
diff --git a/src/core/tests/http_server_test.cpp → src/dist/http/test/http_server_test.cpp b/src/core/tests/http_server_test.cpp → src/dist/http/test/http_server_test.cpp
@@ -5,7 +5,7 @@
 #include <dsn/tool-api/http_server.h>
 #include <gtest/gtest.h>
 
-#include "core/tools/http/http_message_parser.h"
+#include "dist/http/http_message_parser.h"
 
 namespace dsn {
 

diff --git a/src/dist/http/test/run.sh b/src/dist/http/test/run.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ -z "${REPORT_DIR}" ]; then
+    REPORT_DIR="."
+fi
+
+output_xml="${REPORT_DIR}/dsn_http_test.xml"
+GTEST_OUTPUT="xml:${output_xml}" ./dsn_http_test
diff --git a/src/dist/replication/lib/CMakeLists.txt b/src/dist/replication/lib/CMakeLists.txt
@@ -17,6 +17,7 @@ set(MY_PROJ_LIBS
     dsn.failure_detector.multimaster
     dsn_nfs
     dsn_cli
+    dsn_http
     )
 
 set(MY_PROJ_LIB_PATH "")

diff --git a/src/dist/replication/meta_server/CMakeLists.txt b/src/dist/replication/meta_server/CMakeLists.txt
@@ -22,6 +22,7 @@ set(MY_PROJ_LIBS
     dsn.failure_detector
     dsn.replication.zookeeper_provider
     dsn_cli
+    dsn_http
     zookeeper_mt
     galaxy-fds-sdk-cpp
     PocoNet

diff --git a/src/dist/replication/test/meta_test/unit_test/CMakeLists.txt b/src/dist/replication/test/meta_test/unit_test/CMakeLists.txt
@@ -21,6 +21,7 @@ set(MY_PROJ_LIBS dsn.replication.zookeeper_provider
                  dsn.block_service.fds
                  dsn.failure_detector
                  dsn_cli
+                 dsn_http
                  zookeeper_mt
                  galaxy-fds-sdk-cpp
                  PocoNet

diff --git a/src/dist/replication/test/replica_test/unit_test/CMakeLists.txt b/src/dist/replication/test/replica_test/unit_test/CMakeLists.txt
@@ -18,6 +18,7 @@ set(MY_PROJ_LIBS dsn_meta_server
                  dsn.block_service.local
                  dsn.block_service.fds
                  dsn.failure_detector
+                 dsn_http
                  zookeeper_mt
                  galaxy-fds-sdk-cpp
                  PocoNet
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,7 @@ set(MY_PROJ_LIBS @@
         dsn.failure_detector.multimaster
         dsn_nfs
         dsn_cli
+        dsn_http
         )
     set(MY_PROJ_LIB_PATH "")
@@ Expand Down @@