🧪 test: 增加googletest源码

6 files changed, 30 insertions, 8 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e298ffe..eede6ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ variables:
   GIT_STRATEGY: "clone"
   BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/
   INSTALL_PREFIX: "/home/mesasoft/sapp_run/"
-  INSTALL_DEPENDENCY_LIBRARY: libMESA_handle_logger-devel  libcjson-devel libMESA_field_stat2-devel  sapp-devel framework_env  libMESA_prof_load-devel http-devel dns-devel ftp-devel mail-devel ssl-devel  librdkafka-devel libmaatframe-devel tsg_master-devel libdocumentanalyze-devel
+  INSTALL_DEPENDENCY_LIBRARY: libMESA_handle_logger-devel framework_env
 
 stages:
 - analysis
diff --git a/ci/travis.sh b/ci/travis.sh
index 40a2780..147803f 100644
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -57,8 +57,8 @@ if [ -n "${UPLOAD}" ]; then
 	python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *.rpm
 fi
 
-#if [ -n "${UPLOAD_SYMBOL_FILES}" ]; then
-#  rpm -i tfe*debuginfo*.rpm
-#  cp /usr/lib/debug/opt/tsg/tfe/bin/tfe.debug /tmp/tfe.debuginfo.${CI_COMMIT_SHORT_SHA}
-#  sentry-cli upload-dif -t elf /tmp/tfe.debuginfo.${CI_COMMIT_SHORT_SHA}
-#fi
+if [ -n "${UPLOAD_SYMBOL_FILES}" ]; then
+  rpm -i tfe*debuginfo*.rpm
+  cp /usr/lib/debug/opt/tsg/tfe/bin/tfe.debug /tmp/tfe.debuginfo.${CI_COMMIT_SHORT_SHA}
+  sentry-cli upload-dif -t elf /tmp/tfe.debuginfo.${CI_COMMIT_SHORT_SHA}
+fi
diff --git a/gtest/CMakeLists.txt b/gtest/CMakeLists.txt
index 1d30758..b1b37bb 100644
--- a/gtest/CMakeLists.txt
+++ b/gtest/CMakeLists.txt
@@ -3,11 +3,16 @@ project(gtest_tsg_lua)
 aux_source_directory(. SRCS)
 
 include_directories("/opt/MESA/include")
+include_directories("../src")
 link_directories("/opt/MESA/lib")
-link_libraries(tsglua gtest gtest_main pthread)
+link_directories("${CMAKE_BINARY_DIR}/support/GoogleTest/include/")
+link_directories("${CMAKE_BINARY_DIR}/src/")
+link_directories("${CMAKE_BINARY_DIR}/support/GoogleTest/lib/")
+#link_libraries(tsglua gtest gtest_main pthread)
 
 add_definitions(-g -W -Wall)
 add_executable(gtest_tsg_lua ${SRCS})
+add_dependencies(gtest_tsg_lua ${lib_name}_shared gtest)
 target_link_libraries(gtest_tsg_lua tsglua gtest gtest_main pthread)
 
 add_test(NAME SOFT_LINK COMMAND sh -c "ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/script" "${CMAKE_CURRENT_BINARY_DIR}/script")
diff --git a/src/tsg_lua_func.cpp b/src/tsg_lua_func.cpp
index dd18a68..f59fbbc 100644
--- a/src/tsg_lua_func.cpp
+++ b/src/tsg_lua_func.cpp
@@ -695,7 +695,7 @@ int tsg_lua_exec_file(tsg_lua_handle lua, const char *script, const char *in, si
                 *out_type = BOOLEAN;
                 break;
             case LUA_TNUMBER:
-                *(long size_t *)out = lua_tointeger(L, -1);
+                *(long *)out = lua_tointeger(L, -1);
                 //*out_len = 8;
                 *out_type = INTEGER;
                 break;
diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt
index 7363e67..c3cb5c7 100644
--- a/support/CMakeLists.txt
+++ b/support/CMakeLists.txt
@@ -1,5 +1,7 @@
+# CMakeFiles for 3rd vendor library
 include(ExternalProject)
 
+### luajit-2.1
 set(LUAJIT2_ROOT            ${CMAKE_CURRENT_BINARY_DIR})
 set(LUAJIT2_URL             ${CMAKE_CURRENT_SOURCE_DIR}/luajit2-2.1-agentzh.zip)
 set(LUAJIT2_URL_MD5         6e17cd2263473f9b85b47d0736cf12da)
@@ -22,3 +24,18 @@ add_library(luajit2-static STATIC IMPORTED GLOBAL)
 add_dependencies(luajit2-static luajit2)
 set_property(TARGET luajit2-static PROPERTY IMPORTED_LOCATION ${LUAJIT_INSTALL_PREFIX}/lib/libluajit-5.1.a)
 
+#### GoogleTest
+ExternalProject_Add(GoogleTest 
+        PREFIX GoogleTest
+        URL ${CMAKE_CURRENT_SOURCE_DIR}/googletest-release-1.8.0.tar.gz
+        URL_MD5 16877098823401d1bf2ed7891d7dce36
+        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_SHARED_LIBS=ON)
+
+ExternalProject_Get_Property(GoogleTest INSTALL_DIR)
+file(MAKE_DIRECTORY ${INSTALL_DIR}/include)
+add_library(gtest SHARED IMPORTED GLOBAL)
+add_dependencies(gtest GoogleTest)
+set_property(TARGET gtest PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/libgtest.so)
+#set_property(TARGET gtest PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/libgtest_main.so)
+set_property(TARGET gtest PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include)
+set_property(TARGET gtest PROPERTY INTERFACE_LINK_LIBRARIES pthread)
diff --git a/support/googletest-release-1.8.0.tar.gz b/support/googletest-release-1.8.0.tar.gz
new file mode 100644
index 0000000..a40df33
--- /dev/null
+++ b/support/googletest-release-1.8.0.tar.gz