Merge remote-tracking branch 'origin/master' into production

This commit is contained in:
Dan Hawkins 2019-09-20 17:51:43 +01:00
commit 6a709311e7
3 changed files with 25 additions and 7 deletions

View file

@ -40,7 +40,7 @@ def doCheck(checkpathlist, build_variant = "") {
// Print out dependencies of the built file
echo "Showing dependencies of ${srcFileExpanded}"
result = sh( script: """
readelf -d "${srcFileExpanded}" | grep NEEDED
readelf -d "${srcFileExpanded}"
if [ \$? -ne 0 ]; then exit 1; fi
""",
returnStatus: true

View file

@ -63,9 +63,18 @@ pipeline {
script {
def CCMOLDER = "${STATICANALYSIS}/ccm"
dir(CCMOLDER) {
bat """
"${CCM}" "${SRC}" /xml /nummetrics=100 > ccm.xml
"""
echo "Executing: ${CCM} ${SRC} /xml /nummetrics=100 > ccm.xml"
if (isUnix()) {
sh """#!/bin/bash
find "${SRC}" -type f ! -name "*.cpp" -a ! -name "*.h" -a ! -name "*.hpp" -a ! -name "*.c" -exec rm -r {} \;
# Uses mono
"${CCM}" "${SRC}" /xml /nummetrics=100 > ccm.xml
"""
} else {
bat """
"${CCM}" "${SRC}" /xml /nummetrics=100 > ccm.xml
"""
}
}
recordIssues(tools: [
ccm(pattern: "**/ccm.xml", reportEncoding: 'UTF-8'),

View file

@ -57,9 +57,18 @@ pipeline {
script {
def CPPCHECKFOLDER = "${STATICANALYSIS}/cppcheck"
dir(CPPCHECKFOLDER) {
bat """
"${CPPCHECK}" --xml --xml-version=2 "${SRC}" 2> cppcheck.xml
"""
echo "Executing: ${CPPCHECK} --xml --xml-version=2 ${SRC} 2> cppcheck.xml"
if (isUnix()) {
sh """#!/bin/bash
set -e
"${CPPCHECK}" --xml --xml-version=2 "${SRC}" 2> cppcheck.xml
"""
} else {
bat """
"${CPPCHECK}" --xml --xml-version=2 "${SRC}" 2> cppcheck.xml
"""
}
}
recordIssues(tools: [
cppCheck(pattern: "**/cppcheck.xml", reportEncoding: 'UTF-8'),