!665 merge unit and function testcases coverage

Merge pull request !665 from JingWoo/master

CI/build.sh

@@ -456,13 +456,6 @@ if [[ "x${enable_gcov}" == "xON" ]]; then
   mv ./tmp/isulad-gcov /var/www/html/isulad-gcov
   cp isulad-gcov.tar.gz /var/www/html
   rm -rf ./tmp
-
-  tar xf ./isulad-llt-gcov.tar.gz
-  rm -rf /var/www/html/isulad-llt-gcov
-  rm -rf /var/www/html/isulad-llt-gcov.tar.gz
-  mv ./coverage /var/www/html/isulad-llt-gcov
-  cp isulad-llt-gcov.tar.gz /var/www/html
-  rm -rf ./coverage
 fi
 
 if [[ -e $CIDIR/${CONTAINER_NAME}.runflag ]]; then

CI/generate_gcov.sh

@@ -26,32 +26,16 @@ echo "================================Generate GCOV data========================
 
 echo "*****************Get iSulad GCOV data**************************"
 cp -r ~/build $ISULAD_COPY_PATH
-cd $ISULAD_COPY_PATH/build/src/CMakeFiles
-lcov -c -o isulad.info -d isulad.dir
-lcov -c -o isula.info -d isula.dir
-lcov -c -o isulad-shim.info -d isulad-shim.dir
-lcov -c -o libisula.info -d libisula.dir
-
-# Remove std files
-lcov --remove isulad.info '/usr/*' -o isulad.info
-lcov --remove isula.info '/usr/*' -o isula.info
-lcov --remove isulad-shim.info '/usr/*' -o isulad-shim.info
-lcov --remove libisula.info '/usr/*' -o libisula.info
-
-# Generate html
-genhtml --ignore-errors source -o $GCOV_RESULT_PATH/isulad isulad.info
-genhtml --ignore-errors source -o $GCOV_RESULT_PATH/isula isula.info
-genhtml --ignore-errors source -o $GCOV_RESULT_PATH/isulad-shim isulad-shim.info
-genhtml --ignore-errors source -o $GCOV_RESULT_PATH/libisula libisula.info
-
-cd $ISULAD_COPY_PATH/build/src/utils/http/CMakeFiles
-lcov -c -o libhttpclient.info '/usr/*' -o libhttpclient.info
-
-# Remove std file
-lcov --remove libhttpclient.info '/usr/*' -o libhttpclient.info
+cd $ISULAD_COPY_PATH/build
+ctest
+lcov --directory . --capture --output-file coverage.info
+# Remove std/build files
+lcov --remove coverage.info '/usr/*' -o coverage.info
+lcov --remove coverage.info 'build/*' -o coverage.info
+lcov --remove coverage.info 'test/*' -o coverage.info
 
 # Generate html
-genhtml --ignore-errors source -o $GCOV_RESULT_PATH/libhttpclient libhttpclient.info
+genhtml --ignore-errors source -o $GCOV_RESULT_PATH/coverage coverage.info
 
 tar -zcf $ISULAD_SRC_PATH/isulad-gcov.tar.gz $GCOV_RESULT_PATH
 

CI/make-and-install.sh

@@ -72,28 +72,14 @@ cd $ISULAD_COPY_PATH
 sed -i 's/fd == STDIN_FILENO || fd == STDOUT_FILENO || fd == STDERR_FILENO/fd == 0 || fd == 1 || fd == 2 || fd >= 1000/g' ./src/utils/cutils/utils.c
 rm -rf build
 mkdir build && cd build
-if [[ "x${GCOV}" == "xON" ]]; then
-    cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_COVERAGE=ON -DENABLE_UT=ON ..
-    make -j $(nproc)
-    ctest -T memcheck --output-on-failure
-    if [[ $? -ne 0 ]]; then
-        exit 1
-    fi
-    make coverage
-    ISULAD_SRC_PATH=$(env | grep TOPDIR | awk -F = '{print $2}')
-    tar -zcf $ISULAD_SRC_PATH/isulad-llt-gcov.tar.gz ./test/coverage/
-else
-    cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_UT=ON ..
-    make -j $(nproc)
-    ctest -T memcheck --output-on-failure
-    if [[ $? -ne 0 ]]; then
-        exit 1
-    fi
+cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_UT=ON ..
+make -j $(nproc)
+ctest -T memcheck --output-on-failure
+if [[ $? -ne 0 ]]; then
+    exit 1
 fi
 echo_success "===================RUN DT-LLT TESTCASES END========================="
 
-cd $ISULAD_COPY_PATH
-
 # build rest version
 cd $ISULAD_COPY_PATH
 rm -rf build
@@ -111,7 +97,7 @@ rm -rf build
 mkdir build
 cd build
 if [[ ${enable_gcov} -ne 0 ]]; then
-  cmake -DLIB_INSTALL_DIR=${builddir}/lib -DCMAKE_INSTALL_PREFIX=${builddir} -DCMAKE_INSTALL_SYSCONFDIR=${builddir}/etc -DCMAKE_BUILD_TYPE=debug -DGCOV=ON -DENABLE_EMBEDDED=ON ..
+  cmake -DLIB_INSTALL_DIR=${builddir}/lib -DCMAKE_INSTALL_PREFIX=${builddir} -DCMAKE_INSTALL_SYSCONFDIR=${builddir}/etc -DCMAKE_BUILD_TYPE=Debug -DGCOV=ON -DENABLE_EMBEDDED=ON -DENABLE_COVERAGE=ON -DENABLE_UT=ON ..
 else
   cmake -DLIB_INSTALL_DIR=${builddir}/lib -DCMAKE_INSTALL_PREFIX=${builddir} -DCMAKE_INSTALL_SYSCONFDIR=${builddir}/etc -DENABLE_EMBEDDED=ON ..
 fi