X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fcommon%2Fcoverity.sh;h=dae6b5420b85505b0aae51be2c2dbfdca637475a;hb=61afb3c349be6d2ed9c4280cd9fbbadd7d88d3fa;hp=7b2e946516a18e434a6140f608f918a70fa96f16;hpb=a57a60d92c9197bd23c1d4efbc89476a1872a48d;p=lttng-ci.git

diff --git a/scripts/common/coverity.sh b/scripts/common/coverity.sh
index 7b2e946..dae6b54 100755
--- a/scripts/common/coverity.sh
+++ b/scripts/common/coverity.sh
@@ -52,23 +52,34 @@ export TMPDIR
 case "$COVERITY_SCAN_PROJECT_NAME" in
 babeltrace)
     CONF_OPTS="--enable-python-bindings --enable-python-bindings-doc"
+    BUILD_TYPE="autotools"
     ;;
 liburcu)
     CONF_OPTS=""
+    BUILD_TYPE="autotools"
     ;;
 lttng-modules)
     CONF_OPTS=""
+    BUILD_TYPE="autotools"
     ;;
 lttng-tools)
     CONF_OPTS=""
+    BUILD_TYPE="autotools"
     ;;
 lttng-ust)
     CONF_OPTS="--enable-java-agent-all --enable-python-agent"
+    BUILD_TYPE="autotools"
     export CLASSPATH="/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=""
+    BUILD_TYPE="autotools"
     ;;
 esac
 
@@ -141,7 +152,7 @@ cd "$SRCDIR"
 
 COVERITY_SCAN_VERSION=$(git describe --always | sed 's|-|.|g')
 
-# Prepare build dir
+# Prepare build dir for autotools based projects
 if [ -f "./bootstrap" ]; then
   ./bootstrap
   ./configure $CONF_OPTS
@@ -149,7 +160,29 @@ fi
 
 # Build
 echo -e "\033[33;1mRunning Coverity Scan Analysis Tool...\033[0m"
-cov-build --dir "$RESULTS_DIR" $COVERITY_SCAN_BUILD_OPTIONS make -j"$NPROC" V=1
+case "$BUILD_TYPE" in
+maven)
+    cov-configure --java
+    cov-build --dir "$RESULTS_DIR" $COVERITY_SCAN_BUILD_OPTIONS "$MVN_BIN" \
+      -s "$MVN_SETTINGS" \
+      -Dmaven.repo.local="$WORKSPACE/.repository" \
+      -Dmaven.compiler.fork=true \
+      -Dmaven.compiler.forceJavaCompilerUse=true \
+      -Dmaven.test.skip=true \
+      -DskipTests \
+      clean verify
+    ;;
+autotools)
+    cov-build --dir "$RESULTS_DIR" $COVERITY_SCAN_BUILD_OPTIONS make -j"$NPROC" V=1
+    ;;
+*)
+    echo "Unsupported build type: $BUILD_TYPE"
+    exit 1
+    ;;
+esac
+
+
+
 cov-import-scm --dir "$RESULTS_DIR" --scm git --log "$RESULTS_DIR/scm_log.txt"
 
 cd "${WORKSPACE}"
@@ -172,7 +205,9 @@ response=$(curl \
   "$UPLOAD_URL")
 set -x
 status_code=$(echo "$response" | sed -n '$p')
-if [ "$status_code" != "201" ]; then
+if [ "$status_code" == "201" ]; then
+  echo -e "\033[33;1mCoverity Scan upload successful.\033[0m"
+else
   TEXT=$(echo "$response" | sed '$d')
   echo -e "\033[33;1mCoverity Scan upload failed: $TEXT.\033[0m"
   exit 1