From 17f138b146017f768715a2304d19de5fc7bf9d07 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 21 Jan 2019 13:54:30 +0100
Subject: [PATCH] [Jenkins] Added cppcheck to Docker build.
---
CMakeLists.txt | 1 +
Jenkinsfile | 2 ++
scripts/cmake/CppCheck.cmake | 22 ++++++++++++++++++++++
scripts/cmake/Find.cmake | 2 +-
scripts/docker/Dockerfile.gcc.full | 9 ++++++++-
5 files changed, 34 insertions(+), 2 deletions(-)
create mode 100644 scripts/cmake/CppCheck.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14ecd3bab41..5c495c1df2c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,6 +64,7 @@ include(test/Test)
if(OGS_COVERAGE AND NOT IS_SUBPROJECT)
include(Coverage)
endif()
+include(CppCheck)
####################
### More Options ###
diff --git a/Jenkinsfile b/Jenkinsfile
index 70024250cb3..cd63f591e9e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -98,6 +98,7 @@ pipeline {
build { target="tests" }
build { target="ctest" }
build { target="doc" }
+ build { target="cppcheck" }
}
}
post {
@@ -117,6 +118,7 @@ pipeline {
],
tools: [doxygen(pattern: 'build/DoxygenWarnings.log')],
failedTotalAll: 1
+ recordIssues tools: [cppCheck(pattern: 'build/cppcheck.log')]
}
success {
publishHTML(target: [allowMissing: false, alwaysLinkToLastBuild: true,
diff --git a/scripts/cmake/CppCheck.cmake b/scripts/cmake/CppCheck.cmake
new file mode 100644
index 00000000000..07f058cb2f5
--- /dev/null
+++ b/scripts/cmake/CppCheck.cmake
@@ -0,0 +1,22 @@
+if(NOT CPPCHECK_TOOL_PATH)
+ return()
+endif()
+
+if(DEFINED ENV{NUM_THREADS})
+ set(CPPCHECK_THREADS -j $ENV{NUM_THREADS})
+endif()
+
+add_custom_target(cppcheck
+ COMMAND ${CPPCHECK_TOOL_PATH}
+ # --force
+ --enable=all
+ # --inconclusive
+ ${CPPCHECK_THREADS}
+ -i ${PROJECT_BINARY_DIR}/CMakeFiles
+ -i ${PROJECT_SOURCE_DIR}/ThirdParty
+ -i ${PROJECT_SOURCE_DIR}/Applications/DataExplorer
+ -i ${PROJECT_SOURCE_DIR}/Tests
+ --xml --xml-version=2
+ --output-file=${PROJECT_BINARY_DIR}/cppcheck.log
+ ${PROJECT_SOURCE_DIR}
+)
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index a2086a41132..7e64186db25 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -18,7 +18,7 @@ endif()
# Find gnu profiler gprof
find_program(GPROF_PATH gprof DOC "GNU profiler gprof" QUIET)
-find_package(cppcheck QUIET)
+find_program(CPPCHECK_TOOL_PATH cppcheck)
find_package(PythonInterp QUIET)
diff --git a/scripts/docker/Dockerfile.gcc.full b/scripts/docker/Dockerfile.gcc.full
index 4836baee087..8ac8fa30d4a 100644
--- a/scripts/docker/Dockerfile.gcc.full
+++ b/scripts/docker/Dockerfile.gcc.full
@@ -43,7 +43,6 @@ USER root
RUN apt-get update && apt-get install -y \
biber \
clang-tidy \
- cppcheck \
doxygen \
graphviz \
libxml2-utils \
@@ -54,6 +53,14 @@ RUN curl https://include-what-you-use.org/downloads/include-what-you-use-0.8-x86
&& tar xf include-what-you-use-0.8-x86_64-linux-gnu-ubuntu-16.04.tar.gz -C /usr/ --strip-components=1 \
&& rm include-what-you-use-0.8-x86_64-linux-gnu-ubuntu-16.04.tar.gz
+# cppcheck
+RUN curl -L -o 1.86.tar.gz https://github.com/danmar/cppcheck/archive/1.86.tar.gz \
+ && tar xf 1.86.tar.gz \
+ && cd cppcheck-1.86 \
+ && make SRCDIR=build CFGDIR=/usr/share/cppcheck/ CXXFLAGS="-O2 -DNDEBUG -Wall -Wno-sign-compare -Wno-unused-function" \
+ && make install CFGDIR=/usr/share/cppcheck/ \
+ && cd .. && rm -r cppcheck-1.86 1.86.tar.gz
+
RUN apt-get install -y mesa-common-dev libgl1-mesa-dev libxt-dev wget
USER jenkins
--
GitLab