Merge pull request #5 from Simverge/coverity

Add Coverity Scan support

Author: jimmysoda

.travis.yml

@@ -15,13 +15,13 @@ addons:
 env:
   - DISTRO=alpine BUILD_TYPE=Release
   - DISTRO=alpine BUILD_TYPE=Debug
-  - DISTRO=ubuntu BUILD_TYPE=Release
-  - DISTRO=ubuntu BUILD_TYPE=Debug
+  - DISTRO=ubuntu BUILD_TYPE=Release SCAN=coverity
+  - DISTRO=ubuntu BUILD_TYPE=Debug SCAN=sonarcloud
 
 before_install:
   - docker pull simverge/pdalc-build-deps:$DISTRO
 
 script:
   - chmod u+x $TRAVIS_BUILD_DIR/tests/travis/script.sh
-  - docker run -e TRAVIS_BRANCH -e BUILD_TYPE -e DISTRO -v $TRAVIS_BUILD_DIR:/pdalc -t simverge/pdalc-build-deps:$DISTRO /pdalc/tests/travis/script.sh
-  - if [ "$DISTRO" = "ubuntu" ]; then sonar-scanner; fi
+  - docker run -e SCAN -e COVERITY_EMAIL -e COVERITY_TOKEN -e TRAVIS_COMMIT -e TRAVIS_BRANCH -e BUILD_TYPE -e DISTRO -v $TRAVIS_BUILD_DIR:/pdalc -t simverge/pdalc-build-deps:$DISTRO /pdalc/tests/travis/script.sh
+  - if [ "$SCAN" = "sonarcloud" ]; then sonar-scanner; fi

.vscode/tasks.json

@@ -3,6 +3,32 @@
     // for the documentation about the tasks.json format
     "version": "2.0.0",
     "tasks": [
+        {
+            "label": "coverity-vcpkg-x64-windows-release",
+            "type": "shell",
+            "windows": {
+                "command": "rd ${workspaceFolder}\\build\\x64-windows -Recurse; ${env:COVERITY_ROOT}\\bin\\cov-configure.exe --msvc; ${env:COVERITY_ROOT}\\bin\\cov-build.exe --dir ${workspaceFolder}\\build\\x64-windows\\cov-int ${workspaceFolder}\\make.bat"
+            },
+            "options": {
+                "env": {
+                    "BUILD_TYPE": "Release",
+                    "ARCH": "x64",
+                    "TARGET_OS": "windows",
+                    "TOOLCHAIN": "${env:VCPKG_ROOT}\\scripts\\buildsystems\\vcpkg.cmake"
+                }
+            },
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "presentation": {
+                "reveal": "always",
+                "panel": "new"
+            },
+            "problemMatcher": [
+                "$msCompile"
+            ]
+        },
         {
             "label": "vcpkg-x64-windows-release",
             "type": "shell",

CMakeLists.txt

@@ -21,6 +21,8 @@ set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}" CACHE STRING "CMake install prefi
 set(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "CMake debug suffix")
 set(CMAKE_RELWITHDEBINFO_POSTFIX "" CACHE STRING "CMake RelWithDebInfo suffix")
 set(PDALC_ENABLE_CODE_COVERAGE ON CACHE BOOL "Enable code coverage calculation")
+set(PDALC_ENABLE_DOCS ON CACHE BOOL "Enable documentation generation")
+set(PDALC_ENABLE_TESTS ON CACHE BOOL "Enable pdal-c tests")
 set(PDALC_GCC_PARAM_GGC_MIN_HEAPSIZE "131072" CACHE STRING "GCC garbage collection minimum heap size")
 
 include(ObtainProjectVersion)
@@ -29,7 +31,7 @@ include_directories("${CMAKE_SOURCE_DIR}/source")
 if(CMAKE_COMPILER_IS_GNUCXX)
 	add_compile_options(--param ggc-min-heapsize=${PDALC_GCC_PARAM_GGC_MIN_HEAPSIZE})
 
-	if(PDALC_ENABLE_CODE_COVERAGE)
+	if(PDALC_ENABLE_CODE_COVERAGE AND PDALC_ENABLE_TESTS)
 		message(STATUS "Enabled code coverage analysis")
 		include(CodeCoverage)
 		APPEND_COVERAGE_COMPILER_FLAGS()
@@ -43,8 +45,13 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 endif()
 
 add_subdirectory("source/pdal")
-add_subdirectory("doc")
 
-include(CTest)
-add_subdirectory("tests/data")
-add_subdirectory("tests/pdal")
+if(PDALC_ENABLE_DOCS)
+	add_subdirectory("doc")
+endif()
+
+if(PDALC_ENABLE_TESTS)
+	include(CTest)
+	add_subdirectory("tests/data")
+	add_subdirectory("tests/pdal")
+endif()

README.md

@@ -1,15 +1,10 @@
 pdal-c: PDAL C API
 ==================
 
-[![Build Status](https://travis-ci.com/Simverge/pdal-c.svg?branch=master)](https://travis-ci.com/Simverge/pdal-c)[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=Simverge_pdal-c&metric=alert_status)](https://sonarcloud.io/dashboard?id=Simverge_pdal-c)
+[![Build Status](https://travis-ci.com/Simverge/pdal-c.svg?branch=master)](https://travis-ci.com/Simverge/pdal-c)
+[![Coverity Scan](https://scan.coverity.com/projects/17631/badge.svg)](https://scan.coverity.com/projects/simverge-pdal-c)
+[![SonarCloud](https://sonarcloud.io/api/project_badges/measure?project=Simverge_pdal-c&metric=alert_status)](https://sonarcloud.io/dashboard?id=Simverge_pdal-c)
 
-[![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=Simverge_pdal-c&metric=ncloc)](https://sonarcloud.io/dashboard?id=Simverge_pdal-c)
-[![Duplicated Lines (%)](https://sonarcloud.io/api/project_badges/measure?project=Simverge_pdal-c&metric=duplicated_lines_density)](https://sonarcloud.io/dashboard?id=Simverge_pdal-c)[![Technical Debt](https://sonarcloud.io/api/project_badges/measure?project=Simverge_pdal-c&metric=sqale_index)](https://sonarcloud.io/dashboard?id=Simverge_pdal-c)
-
-[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=Simverge_pdal-c&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=Simverge_pdal-c)
-[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=Simverge_pdal-c&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=Simverge_pdal-c)
-[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=Simverge_pdal-c&metric=security_rating)](https://sonarcloud.io/dashboard?id=Simverge_pdal-c)
-[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=Simverge_pdal-c&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=Simverge_pdal-c)
 
 *pdal-c* is a C API for the Point Data Abstraction Library ([PDAL](http:/github.com/PDAL/PDAL))
 and is compatible with PDAL 1.7 and later.

source/pdal/CMakeLists.txt

@@ -49,7 +49,7 @@ set_target_properties(${TARGET} PROPERTIES
 )
 
 # Measure code coverage on gcc
-if(CMAKE_COMPILER_IS_GNUCXX AND PDALC_ENABLE_CODE_COVERAGE)
+if(CMAKE_COMPILER_IS_GNUCXX AND PDALC_ENABLE_CODE_COVERAGE AND PDALC_ENABLE_TESTS)
 	SETUP_TARGET_FOR_COVERAGE(
 		NAME coverage_${TARGET}
 		EXECUTABLE test_${TARGET}

tests/docker/pdalc-build-deps_alpine/Dockerfile

@@ -12,4 +12,5 @@ RUN \
 		lcov \
 		make \
 		cmake \
-		curl
+		curl \
+		wget

tests/docker/pdalc-build-deps_ubuntu/Dockerfile

@@ -6,5 +6,6 @@ apt-get update && apt-get install -y --no-install-recommends \
     build-essential \
     cmake \
     lcov \
+    wget \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*

tests/travis/script.sh

@@ -3,25 +3,53 @@
 gcc --version
 g++ --version
 
-if [ "$DISTRO" = "ubuntu" ]; then
-	# Download and unzip the sonarcloud build wrapper
+PDALC_CMAKE_ARGS="-DPDALC_GCC_PARAM_GGC_MIN_HEAPSIZE=8192"
+
+if [ "$SCAN" = "sonarcloud" ]; then
 	curl -LsS https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip > build-wrapper-linux-x86.zip
 	unzip build-wrapper-linux-x86.zip
-	export SONARCLOUD_DIR=$PWD/build-wrapper-linux-x86
+	rm build-wrapper-linux-x86.zip
+	export SONARCLOUD_DIR=${PWD}/build-wrapper-linux-x86
+
+elif [ "$SCAN" = "coverity" ] && [ "$TRAVIS_BRANCH" = "master" ]; then
+	curl -LsS -d "token=${COVERITY_TOKEN}&project=Simverge%2Fpdal-c" -X POST https://scan.coverity.com/download/cxx/linux64 > coverity_tool.tgz
+	tar xaf coverity_tool.tgz
+	rm coverity_tool.tgz
+	mv cov-analysis-linux64-* cov-analysis-linux64
+	export COVERITY_DIR=${PWD}/cov-analysis-linux64/bin
+
+	PDALC_CMAKE_ARGS += "-DPDALC_ENABLE_CODE_COVERAGE=OFF"
+	PDALC_CMAKE_ARGS += "-DPDALC_ENABLE_DOCS=OFF"
 fi
 
 export CI_PROJECT_DIR=/pdalc
 export CI_PROJECT_NAME=pdal-c
 export TARGET_PLATFORM=$DISTRO-`uname -m`-$BUILD_TYPE
-echo "Building $CI_PROJECT_NAME ($TRAVIS_BRANCH branch) for $TARGET_PLATFORM"
+echo "Building $CI_PROJECT_NAME ($TRAVIS_BRANCH-$TRAVIS_COMMIT) for $TARGET_PLATFORM"
 rm -rf "$CI_PROJECT_DIR/build/$TARGET_PLATFORM" 
 mkdir -p "$CI_PROJECT_DIR/build/$TARGET_PLATFORM"
 cd "$CI_PROJECT_DIR/build/$TARGET_PLATFORM"
-cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPDALC_GCC_PARAM_GGC_MIN_HEAPSIZE=8192 "$CI_PROJECT_DIR"
 
-if [ "$DISTRO" = "ubuntu" ]; then
-	$SONARCLOUD_DIR/build-wrapper-linux-x86-64 --out-dir $CI_PROJECT_DIR/bw-output make
+cmake -G "Unix Makefiles" \
+	-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
+	${PDALC_CMAKE_ARGS} \
+	"${CI_PROJECT_DIR}"
+
+if [ "$SCAN" = "sonarcloud" ]; then
+	${SONARCLOUD_DIR}/build-wrapper-linux-x86-64 --out-dir ${CI_PROJECT_DIR}/bw-output make
+elif [ "$SCAN" = "coverity" ] && [ "$TRAVIS_BRANCH" = "master" ]; then
+	${COVERITY_DIR}/cov-configure --gcc
+	${COVERITY_DIR}/cov-build --dir ${CI_PROJECT_DIR}/cov-int make
+	cd ${CI_PROJECT_DIR}
+	tar czf cov-int.tgz cov-int
+
+	curl --form token="${COVERITY_TOKEN}" \
+		--form email="${COVERITY_EMAIL}" \
+		--form file=@${CI_PROJECT_DIR}/cov-int.tgz \
+		--form version="${TRAVIS_BRANCH}-$TRAVIS_COMMIT" \
+		--form description="Automatic Coverity Scan build for ${TRAVIS_BRANCH}-$TRAVIS_COMMIT" \
+		https://scan.coverity.com/builds?project=Simverge%2Fpdal-c
 else
+	echo "Running build without static analysis scans"
 	make
 fi
-make coverage_pdalc