update the coverage

code4game · Oct 16, 2020 · 46efd10 · 46efd10
1 parent d816504
commit 46efd10
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 19 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -30,7 +30,7 @@ jobs:
     - name: 'build and make'
       run: |
         mkdir build && cd build
-        cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DLIBGLTF_CHARACTOR_ENCODING=UTF8 -DLIBGLTF_BUILD_GCOV=TRUE -DLIBGLTF_USE_GOOGLE_DRACO=TRUE -DLIBGLTF_USE_GOOGLE_DRACO_SUBMODULE=TRUE ../
+        cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DLIBGLTF_CHARACTOR_ENCODING=UTF8 -DLIBGLTF_BUILD_COVERAGE=TRUE -DLIBGLTF_USE_GOOGLE_DRACO=TRUE -DLIBGLTF_USE_GOOGLE_DRACO_SUBMODULE=TRUE ../
         make
         cd ../
     - name: 'run valgrind and gcovr'

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -44,12 +44,12 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Wshadow -Wconversion -Wsign-conversion -Wno-long-long -pedantic")
     set(CMAKE_STATIC_LIBRARY_PREFIX "")
     set(CMAKE_SHARED_LIBRARY_PREFIX "")
-    set(LIBGLTF_COVERAGE_GCOV OFF CACHE BOOL "Coverage gcov (debug, Linux builds only)")
-    if(LIBGLTF_COVERAGE_GCOV)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage -fPIC")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage -fPIC")
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -lgcov")
-        add_definitions(-DLIBGLTF_BUILD_COVERAGE_GCOV)
+    set(LIBGLTF_BUILD_COVERAGE OFF CACHE BOOL "Coverage gcov (debug, Linux builds only)")
+    if(LIBGLTF_BUILD_COVERAGE)
+        add_definitions(-DLIBGLTF_BUILD_COVERAGE)
+        set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage -fPIC")
+        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage -fPIC")
+        set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage -lgcov")
     endif()
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
     set(LIBGLTF_PLATFORM_ANDROID TRUE)
@@ -172,17 +172,6 @@ elseif(${LIBGLTF_CHARACTOR_ENCODING} STREQUAL "UNICODE")
     endif()
 endif()
 
-if(${LIBGLTF_BUILD_GCOV})
-    if(${LIBGLTF_PLATFORM_LINUX})
-        add_definitions(-DLIBGLTF_BUILD_COVERAGE)
-        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage")
-        set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage")
-        set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage -lgcov")
-    else()
-        message(FATAL_ERROR "Sorry, don't support gcov in your system ${CMAKE_SYSTEM_NAME}!")
-    endif()
-endif()
-
 set(LIBGLTF_BUILD_RUNTEST TRUE CACHE BOOL "Build runtest?")
 
 add_subdirectory(docs)

diff --git a/source/runtest/runtest.cpp b/source/runtest/runtest.cpp
@@ -178,7 +178,7 @@ int main(int _iArgc, char* _pcArgv[])
     std::shared_ptr<libgltf::TAccessorStream<libgltf::TDimensionVector<2, float> > > texcoord_0_stream = std::make_shared<libgltf::TAccessorStream<libgltf::TDimensionVector<2, float> > >(texcoord_0_data);
     gltf_loader->GetOrLoadMeshPrimitiveAttributeData(0, 0, GLTFTEXT("texcoord_0"), texcoord_0_stream);
 
-#if defined(LIBGLTF_BUILD_COVERAGE_GCOV)
+#if defined(LIBGLTF_BUILD_COVERAGE)
     const std::string obj_file_path =
 #if defined(LIBGLTF_CHARACTOR_ENCODING_IS_UNICODE) && defined(LIBGLTF_PLATFORM_WINDOWS)
         libgltf::UNICODEToUTF8(input_file_path + GLTFTEXT(".obj"));