From 37a7809308f3a2f7dac2ce6feab1aa9c1113fdc8 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vincent.sanders@collabora.co.uk>
Date: Sat, 16 Nov 2013 12:55:03 +0000
Subject: fix coverity to pass project name and verify required parameters are
 set

---
 citools/jenkins-build.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/citools/jenkins-build.sh b/citools/jenkins-build.sh
index 3ec0de6..4ea0a8c 100755
--- a/citools/jenkins-build.sh
+++ b/citools/jenkins-build.sh
@@ -162,14 +162,23 @@ elif [ "x${TARGET}" = "x${TARGET_STATIC}" ]; then
 elif [ "x${TARGET}" = "x${TARGET_COVERITY}" ]; then
     # coverity build
 
+    # Check thses are set
+    #
+    # COVERITY_PROJECT
     # COVERITY_TOKEN
     # COVERITY_USER
     # COVERITY_PREFIX
 
+    if [ -n "${COVERITY_PROJECT}" -o -n "${COVERITY_TOKEN}" -o -n "${COVERITY_USER}" -o -n "${COVERITY_PREFIX}" ]; then
+	echo "Coverity parameters not set"
+	exit 1
+    fi
+
     # Coverity tools location
     COVERITY_PREFIX=${COVERITY_PREFIX:-/opt/coverity/cov-analysis-linux64-6.6.1}
     COVERITY_VERSION=$(git rev-parse HEAD)
 
+
     export PATH=${PATH}:${COVERITY_PREFIX}/bin
 
     # cleanup before we start
@@ -181,7 +190,7 @@ elif [ "x${TARGET}" = "x${TARGET_COVERITY}" ]; then
 
     gzip -9 coverity-scan.tar
 
-    curl --form "project=NetSurf" --form "token=${COVERITY_TOKEN}" --form "email=${COVERITY_USER}" --form "file=@coverity-scan.tar.gz" --form "version=${COVERITY_VERSION}" --form "description=Git Head build" http://scan5.coverity.com/cgi-bin/upload.py
+    curl --form "project=${COVERITY_PROJECT}" --form "token=${COVERITY_TOKEN}" --form "email=${COVERITY_USER}" --form "file=@coverity-scan.tar.gz" --form "version=${COVERITY_VERSION}" --form "description=Git Head build" http://scan5.coverity.com/cgi-bin/upload.py
 
 else
     # Normal build
-- 
cgit v1.2.3