X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=scripts%2Fcommon%2Fcoverity.sh;fp=scripts%2Fcommon%2Fcoverity.sh;h=b5ca3690a0787a62c9512fc571c4436537b0db6d;hb=30c8dface5a52c13820bf882a5f3c7252f53ebce;hp=ac60db5b93c8cf36ee1c9c817aef46810fbde7cc;hpb=6544f0ff082d9e49510062795ef5a68369faa69a;p=lttng-ci.git

diff --git a/scripts/common/coverity.sh b/scripts/common/coverity.sh
index ac60db5..b5ca369 100755
--- a/scripts/common/coverity.sh
+++ b/scripts/common/coverity.sh
@@ -16,6 +16,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# Required variables
+WORKSPACE=${WORKSPACE:-}
+
 # Coverity settings
 # The project name and token have to be provided trough env variables
 #COVERITY_SCAN_PROJECT_NAME=""
@@ -25,6 +28,17 @@ COVERITY_SCAN_NOTIFICATION_EMAIL="ci-notification@lists.lttng.org"
 COVERITY_SCAN_BUILD_OPTIONS=""
 #COVERITY_SCAN_BUILD_OPTIONS="--return-emit-failures 8 --parse-error-threshold 85"
 
+DEPS_INC="$WORKSPACE/deps/build/include"
+DEPS_LIB="$WORKSPACE/deps/build/lib"
+DEPS_PKGCONFIG="$DEPS_LIB/pkgconfig"
+DEPS_BIN="$WORKSPACE/deps/build/bin"
+
+export PATH="$DEPS_BIN:$PATH"
+export LD_LIBRARY_PATH="$DEPS_LIB:${LD_LIBRARY_PATH:-}"
+export PKG_CONFIG_PATH="$DEPS_PKGCONFIG"
+export CPPFLAGS="-I$DEPS_INC"
+export LDFLAGS="-L$DEPS_LIB"
+
 SRCDIR="$WORKSPACE/src/${COVERITY_SCAN_PROJECT_NAME}"
 TMPDIR="$WORKSPACE/tmp"
 
@@ -87,27 +101,6 @@ linux-rseq)
     ;;
 esac
 
-# liburcu dependency
-if [ -d "$WORKSPACE/deps/liburcu" ]; then
-  URCU_INCS="$WORKSPACE/deps/liburcu/build/include/"
-  URCU_LIBS="$WORKSPACE/deps/liburcu/build/lib/"
-
-  export CPPFLAGS="-I$URCU_INCS ${CPPFLAGS:-}"
-  export LDFLAGS="-L$URCU_LIBS ${LDFLAGS:-}"
-  export LD_LIBRARY_PATH="$URCU_LIBS:${LD_LIBRARY_PATH:-}"
-fi
-
-
-# lttng-ust dependency
-if [ -d "$WORKSPACE/deps/lttng-ust" ]; then
-  UST_INCS="$WORKSPACE/deps/lttng-ust/build/include/"
-  UST_LIBS="$WORKSPACE/deps/lttng-ust/build/lib/"
-
-  export CPPFLAGS="-I$UST_INCS ${CPPFLAGS:-}"
-  export LDFLAGS="-L$UST_LIBS ${LDFLAGS:-}"
-  export LD_LIBRARY_PATH="$UST_LIBS:${LD_LIBRARY_PATH:-}"
-fi
-
 if [ -d "$WORKSPACE/src/linux" ]; then
 	export KERNELDIR="$WORKSPACE/src/linux"
 fi