From: Francois-Xavier Le Bail <fx.lebail@yahoo.com>
Date: Fri, 30 Oct 2015 13:51:47 +0000 (+0100)
Subject: Coverity: Build script: Update the upload URL for the framework change
X-Git-Tag: libpcap-1.8.0-bp~124
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/4093bb2c65f88be21036e7f443eeb0abd5ce3ff1

Coverity: Build script: Update the upload URL for the framework change

This fix the build submission error.

Moreover:
More sync with the updated default build script.
---

diff --git a/.travis-coverity-scan-build.sh b/.travis-coverity-scan-build.sh
index 37ef7346..892dac1e 100644
--- a/.travis-coverity-scan-build.sh
+++ b/.travis-coverity-scan-build.sh
@@ -3,7 +3,7 @@
 set -e
 
 # Environment check
-echo -e "\033[33;1mNote: PROJECT_NAME and COVERITY_SCAN_TOKEN are available on Project Settings page on scan.coverity.com\033[0m"
+echo -e "\033[33;1mNote: COVERITY_SCAN_PROJECT_NAME and COVERITY_SCAN_TOKEN are available on Project Settings page on scan.coverity.com\033[0m"
 [ -z "$COVERITY_SCAN_PROJECT_NAME" ] && echo "ERROR: COVERITY_SCAN_PROJECT_NAME must be set" && exit 1
 #[ -z "$COVERITY_SCAN_NOTIFICATION_EMAIL" ] && echo "ERROR: COVERITY_SCAN_NOTIFICATION_EMAIL must be set" && exit 1
 [ -z "$COVERITY_SCAN_BRANCH_PATTERN" ] && echo "ERROR: COVERITY_SCAN_BRANCH_PATTERN must be set" && exit 1
@@ -14,7 +14,7 @@ PLATFORM=`uname`
 TOOL_ARCHIVE=/tmp/cov-analysis-${PLATFORM}.tgz
 TOOL_URL=https://scan.coverity.com/download/cxx/${PLATFORM}
 TOOL_BASE=/tmp/coverity-scan-analysis
-UPLOAD_URL="http://scan5.coverity.com/cgi-bin/travis_upload.py"
+UPLOAD_URL="https://scan.coverity.com/builds"
 SCAN_URL="https://scan.coverity.com"
 
 # Verify Coverity Scan run condition
@@ -24,7 +24,7 @@ if eval [ $COVERITY_SCAN_RUN_CONDITION ]; then
   echo -e "True.\033[0m"
 else
   echo -e "False. Exit.\033[0m"
-  exit 1
+  exit 0
 fi
 
 # Do not run on pull requests
@@ -54,7 +54,7 @@ else
   else
     WHEN=`echo $AUTH_RES | ruby -e "require 'rubygems'; require 'json'; puts JSON[STDIN.read]['next_upload_permitted_at']"`
     echo -e "\033[33;1mCoverity Scan analysis NOT authorized until $WHEN.\033[0m"
-    exit 1
+    exit 0
   fi
 fi
 
@@ -83,6 +83,7 @@ COV_BUILD_OPTIONS=""
 RESULTS_DIR="cov-int"
 eval "${COVERITY_SCAN_BUILD_COMMAND_PREPEND}"
 COVERITY_UNSUPPORTED=1 cov-build --dir $RESULTS_DIR $COV_BUILD_OPTIONS $COVERITY_SCAN_BUILD_COMMAND
+cov-import-scm --dir $RESULTS_DIR --scm git --log $RESULTS_DIR/scm_log.txt 2>&1
 
 # Upload results
 echo -e "\033[33;1mTarring Coverity Scan Analysis results...\033[0m"
@@ -94,16 +95,22 @@ VERSION_SHA=$(cat VERSION)#$SHA
 # Verify Coverity Scan script test mode
 if [ "$coverity_scan_script_test_mode" = true ]; then
   echo -e "\033[33;1mCoverity Scan configured in script test mode. Exit.\033[0m"
-  exit 1
+  exit 0
 fi
 
 echo -e "\033[33;1mUploading Coverity Scan Analysis results...\033[0m"
-curl \
-  --progress-bar \
+response=$(curl \
+  --silent --write-out "\n%{http_code}\n" \
   --form project=$COVERITY_SCAN_PROJECT_NAME \
   --form token=$COVERITY_SCAN_TOKEN \
-  --form email=$COVERITY_SCAN_NOTIFICATION_EMAIL \
+  --form email=blackhole@blackhole.io \
   --form file=@$RESULTS_ARCHIVE \
   --form version=$SHA \
   --form description="$VERSION_SHA" \
-  $UPLOAD_URL
+  $UPLOAD_URL)
+status_code=$(echo "$response" | sed -n '$p')
+if [ "$status_code" != "201" ]; then
+  TEXT=$(echo "$response" | sed '$d')
+  echo -e "\033[33;1mCoverity Scan upload failed: $TEXT.\033[0m"
+  exit 1
+fi