From 1603dba215787d269bca3e1d1ef9865fc918de35 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Sun, 12 Oct 2014 13:40:51 +0200
Subject: modify Jenkins scan-build script to output the results to the
 directory that the Publish Clang Scan-Build Results plugin expects.

(bzr r13341.1.274)
---
 jenkins/jenkins-scanbuild.sh | 35 +++--------------------------------
 1 file changed, 3 insertions(+), 32 deletions(-)

diff --git a/jenkins/jenkins-scanbuild.sh b/jenkins/jenkins-scanbuild.sh
index b414e4aeb..492cefead 100644
--- a/jenkins/jenkins-scanbuild.sh
+++ b/jenkins/jenkins-scanbuild.sh
@@ -5,38 +5,9 @@ make clean
 # do not exit immediately if any command fails
 set +e
      
-# temp directory to store the scan-build report
-SCAN_BUILD_TMPDIR=$( mktemp -d /tmp/scan-build.XXXXXX )
-
-# directory to use for archiving the scan-build report
-SCAN_BUILD_ARCHIVE="${WORKSPACE}/scan-build-archive"
+# directory to use for storing the scan-build report, this is where the Publish Clang Scan-Build Results plugin checks
+SCAN_BUILD_OUTPUTDIR="${WORKSPACE}/clangScanBuildReports"
 
 # generate the scan-build report
-scan-build -k -o ${SCAN_BUILD_TMPDIR} make
-     
-# get the directory name of the report created by scan-build
-SCAN_BUILD_REPORT=$( find ${SCAN_BUILD_TMPDIR} -maxdepth 1 -not -empty -not -name `basename ${SCAN_BUILD_TMPDIR}` )
-rc=$?
-
-if [ -z "${SCAN_BUILD_REPORT}" ]; then
-        echo ">>> No new bugs identified."
-        echo ">>> No scan-build report has been generated"
-else
-        echo ">>> New scan-build report generated in ${SCAN_BUILD_REPORT}"
+scan-build -k -o ${SCAN_BUILD_OUTPUTDIR} make
      
-        if [ ! -d "${SCAN_BUILD_ARCHIVE}" ]; then
-                echo ">>> Creating scan-build archive directory"
-                install -d -o jenkins -g jenkins -m 0755 "${SCAN_BUILD_ARCHIVE}"
-        else
-                echo ">>> Removing any previous scan-build reports from ${SCAN_BUILD_ARCHIVE}"
-                rm -f "${SCAN_BUILD_ARCHIVE}/*"
-        fi
-     
-        echo ">>> Archiving scan-build report to ${SCAN_BUILD_ARCHIVE}"
-        mv ${SCAN_BUILD_REPORT}/* "${SCAN_BUILD_ARCHIVE}/"
-           
-        echo ">>> Removing any temporary files and directories"
-        rm -rf "${SCAN_BUILD_TMPDIR}"
-fi
-
-exit ${rc}
-- 
cgit v1.2.3