jjb: remove -DDEBUG from coverity CFLAGS

[lttng-ci.git] / scripts / common / coverity.sh

diff --git a/scripts/common/coverity.sh b/scripts/common/coverity.sh
index d707ad2cefe5a07f647359192a7b2f030dc30e0b..21e76aba68f0312303cacf1867b732601d33c7b0 100755 (executable)
--- a/scripts/common/coverity.sh
+++ b/scripts/common/coverity.sh
@@ -34,8 +34,8 @@ TMPDIR="$WORKSPACE/tmp"
 
 NPROC=$(nproc)
 PLATFORM=$(uname)
-export CFLAGS="-O0 -g -DDEBUG"
-export CXXFLAGS="-O0 -g -DDEBUG"
+export CFLAGS="-O0 -g"
+export CXXFLAGS="-O0 -g"
 
 # Cache the tool installer in the home directory since we delete the workspace
 # on each build
@@ -78,11 +78,6 @@ lttng-ust)
     BUILD_TYPE="autotools"
     export CLASSPATH="/usr/share/java/log4j-api.jar:/usr/share/java/log4j-core.jar:/usr/share/java/log4j-1.2.jar"
     ;;
-lttng-scope|ctf-java|libdelorean-java|jabberwocky)
-    CONF_OPTS=()
-    BUILD_TYPE="maven"
-    MVN_BIN="$HOME/tools/hudson.tasks.Maven_MavenInstallation/default/bin/mvn"
-    ;;
 *)
     echo "Generic project, no configure options."
     CONF_OPTS=()
@@ -120,7 +115,13 @@ fi
 if [ ! -d "$TOOL_BASE" ]; then
   echo -e "\033[33;1mDownloading Coverity Scan Analysis Tool...\033[0m"
   set +x
-  curl --fail --remote-time --continue-at - --form project="$COVERITY_SCAN_PROJECT_NAME" --form token="$COVERITY_SCAN_TOKEN" --output "$TOOL_ARCHIVE" --time-cond "$TOOL_ARCHIVE" "$TOOL_URL"
+  curl --fail \
+       --location \
+       --remote-time \
+       --form project="$COVERITY_SCAN_PROJECT_NAME" \
+       --form token="$COVERITY_SCAN_TOKEN" \
+       --output "$TOOL_ARCHIVE" \
+       "$TOOL_URL" || rm -f "$TOOL_ARCHIVE"
   set -x
 
   # Extract Coverity Scan Analysis Tool
@@ -177,9 +178,8 @@ tar czf $RESULTS_ARCHIVE $RESULTS_DIR_NAME
 
 # Upload results
 echo -e "\033[33;1mUploading Coverity Scan Analysis results...\033[0m"
-set +x
 response=$(curl \
-  --silent --write-out "\n%{http_code}\n" \
+  --write-out "\n%{http_code}\n" \
   --form project="$COVERITY_SCAN_PROJECT_NAME" \
   --form token="$COVERITY_SCAN_TOKEN" \
   --form email="$COVERITY_SCAN_NOTIFICATION_EMAIL" \
@@ -187,7 +187,6 @@ response=$(curl \
   --form version="$COVERITY_SCAN_VERSION" \
   --form description="$COVERITY_SCAN_DESCRIPTION" \
   "$UPLOAD_URL")
-set -x
 status_code=$(echo "$response" | sed -n '$p')
 if [ "${status_code:0:1}" == "2" ]; then
   echo -e "\033[33;1mCoverity Scan upload successful.\033[0m"