Depends-on: take into consideration the git branch for query and default

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

diff --git a/scripts/common/coverity.sh b/scripts/common/coverity.sh
index b5ca3690a0787a62c9512fc571c4436537b0db6d..d23160af514ac6642d43a9a8e5db111d78397619 100755 (executable)
--- a/scripts/common/coverity.sh
+++ b/scripts/common/coverity.sh
@@ -1,6 +1,6 @@
-#!/bin/bash -exu
+#!/bin/bash
 #
-# Copyright (C) 2019 Michael Jeanson <mjeanson@efficios.com>
+# Copyright (C) 2020 Michael Jeanson <mjeanson@efficios.com>
 # Copyright (C) 2015 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
 #
 # This program is free software: you can redistribute it and/or modify
@@ -16,6 +16,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+set -exu
+
 # Required variables
 WORKSPACE=${WORKSPACE:-}
 
@@ -83,17 +85,13 @@ lttng-tools)
 lttng-ust)
     CONF_OPTS="--enable-java-agent-all --enable-python-agent"
     BUILD_TYPE="autotools"
-    export CLASSPATH="/usr/share/java/log4j-1.2.jar"
+    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"
     ;;
-linux-rseq)
-    CONF_OPTS=""
-    BUILD_TYPE="linux-rseq"
-    ;;
 *)
     echo "Generic project, no configure options."
     CONF_OPTS=""
@@ -173,11 +171,6 @@ autotools)
 
     cov-build --dir "$RESULTS_DIR" $COVERITY_SCAN_BUILD_OPTIONS make -j"$NPROC" V=1
     ;;
-linux-rseq)
-    make defconfig
-    make -j"$NPROC" prepare
-    cov-build --dir "$RESULTS_DIR" $COVERITY_SCAN_BUILD_OPTIONS make -j"$NPROC" kernel/rseq.o kernel/do_on_cpu/core.o kernel/do_on_cpu/interpreter.o kernel/do_on_cpu/validate.o V=1
-    ;;
 *)
     echo "Unsupported build type: $BUILD_TYPE"
     exit 1