move kvdb test files into tests

CMakeLists.txt

@@ -65,8 +65,8 @@ endif()
 if (NOT CLIENT_ONLY)
 include(external/jsoncpp)
 include(external/rocksdb)
-include(external/gtest)
 endif()
+#include(external/gtest)
 
 include(external/snappy)
 include(external/leveldb)

cmake/external/gtest.cmake

@@ -28,7 +28,7 @@ ExternalProject_Add(
     GIT_TAG master
     UPDATE_COMMAND ""
     CONFIGURE_COMMAND ""
-    BUILD_COMMAND CXXFLAGS=-fPIC && mkdir build && cd build && cmake .. && make -j ${NUM_OF_PROCESSOR} gtest
+    BUILD_COMMAND CXXFLAGS=-fPIC && mkdir -p build && cd build && /home/users/dongdaxiang/software/cmake-3.15.2/bin/cmake .. && make -j ${NUM_OF_PROCESSOR} gtest
     INSTALL_COMMAND mkdir -p ${GTEST_INSTALL_DIR}/lib/ 
     && cp ${GTEST_SOURCES_DIR}/src/extern_gtest/build/lib/libgtest.a ${GTEST_LIBRARIES}
     && cp -r ${GTEST_SOURCES_DIR}/src/extern_gtest/googletest/include ${GTEST_INSTALL_DIR}/
@@ -41,4 +41,3 @@ ADD_LIBRARY(gtest STATIC IMPORTED GLOBAL)
 SET_PROPERTY(TARGET gtest PROPERTY IMPORTED_LOCATION ${GTEST_LIBRARIES})
 
 LIST(APPEND external_project_dependencies gtest)
-

core/cube/cube-server/CMakeLists.txt

@@ -67,10 +67,10 @@ endif()
 
 target_link_libraries(cube brpc ${DYNAMIC_LIB} -lpthread -ldl -lz)
 
-add_executable(cube_test ${SRC_LIST} test/cube_test.cpp
-    ${PROTO_SRC} ${PROTO_HEADER})
+#add_executable(cube_test ${SRC_LIST} test/cube_test.cpp
+#    ${PROTO_SRC} ${PROTO_HEADER})
 
-target_link_libraries(cube_test brpc ${DYNAMIC_LIB} gtest -lpthread -ldl -lz)
+#target_link_libraries(cube_test brpc ${DYNAMIC_LIB} gtest -lpthread -ldl -lz)
 
 # install
 install(TARGETS cube

core/kvdb/CMakeLists.txt

 
 include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/include)
 
-set(SRC_LIST ${CMAKE_CURRENT_LIST_DIR}/src/test_rocksdb.cpp 
-            ${CMAKE_CURRENT_LIST_DIR}/src/rockskvdb_impl.cpp
+set(SRC_LIST ${CMAKE_CURRENT_LIST_DIR}/src/rockskvdb_impl.cpp
             ${CMAKE_CURRENT_LIST_DIR}/src/param_dict_mgr_impl.cpp
             ${CMAKE_CURRENT_LIST_DIR}/src/mock_param_dict_impl.cpp
-            ${CMAKE_CURRENT_LIST_DIR}/src/paddle_rocksdb.cpp
-            ${CMAKE_CURRENT_LIST_DIR}/src/gtest_kvdb.cpp)
+            ${CMAKE_CURRENT_LIST_DIR}/src/paddle_rocksdb.cpp)
        
 add_library(kvdb ${SRC_LIST})
 add_dependencies(kvdb rocksdb)
 install(TARGETS kvdb ARCHIVE DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/lib/)
 
-add_executable(kvdb_test ${SRC_LIST})
-add_dependencies(kvdb_test rocksdb)
-target_link_libraries(kvdb_test rocksdb bz2 snappy zlib gtest)
-#target_include_directories(kvdb_test PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include/kvdb)
 
-set(SRC_LIST2 ${CMAKE_CURRENT_LIST_DIR}/src/gtest_db_thread.cpp
-            ${CMAKE_CURRENT_LIST_DIR}/src/rockskvdb_impl.cpp
+set(SRC_LIST2 ${CMAKE_CURRENT_LIST_DIR}/src/rockskvdb_impl.cpp
             ${CMAKE_CURRENT_LIST_DIR}/src/param_dict_mgr_impl.cpp
             ${CMAKE_CURRENT_LIST_DIR}/src/mock_param_dict_impl.cpp
             ${CMAKE_CURRENT_LIST_DIR}/src/paddle_rocksdb.cpp)
 
-
-add_executable(db_thread ${SRC_LIST2})
-add_dependencies(db_thread rocksdb)
-target_link_libraries(db_thread rocksdb bz2 snappy zlib gtest)
-#target_include_directories(db_thread PUBLIC  ${CMAKE_CURRENT_LIST_DIR}/include/kvdb)
-
-
-set(SRC_LIST3 ${CMAKE_CURRENT_LIST_DIR}/src/gtest_db_func.cpp
-             ${CMAKE_CURRENT_LIST_DIR}/src/rockskvdb_impl.cpp
-             ${CMAKE_CURRENT_LIST_DIR}/src/param_dict_mgr_impl.cpp
-             ${CMAKE_CURRENT_LIST_DIR}/src/mock_param_dict_impl.cpp
-             ${CMAKE_CURRENT_LIST_DIR}/src/paddle_rocksdb.cpp)
-
-add_executable(db_func ${SRC_LIST3})
-add_dependencies(db_func rocksdb)
-target_link_libraries(db_func rocksdb bz2 snappy zlib gtest)
-#target_include_directories(db_func PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include/kvdb)
-
-install(TARGETS kvdb_test 
-        RUNTIME DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/demo/kvdb_test)
-install(TARGETS db_thread
-        RUNTIME DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/demo/db_thread)
-install(TARGETS db_func
-        RUNTIME DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/demo/db_func)
-
-
 file(GLOB kvdb_headers "${CMAKE_CURRENT_LIST_DIR}/include/kvdb/*.h")
 install(FILES ${kvdb_headers} DESTINATION
       ${PADDLE_SERVING_INSTALL_DIR}/include/kvdb/)