From 30c8dface5a52c13820bf882a5f3c7252f53ebce Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 7 Nov 2019 13:41:13 -0500
Subject: [PATCH 1/1] jjb: Add PKG_CONFIG_PATH to coverity script

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
 jobs/lttng-tools.yaml      |  4 ++--
 jobs/lttng-ust.yaml        |  2 +-
 scripts/common/coverity.sh | 35 ++++++++++++++---------------------
 3 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index cfbf8d9..8680791 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -600,14 +600,14 @@
           which-build: last-successful
           stable: false
           filter: 'build/**'
-          target: 'deps/liburcu'
+          target: 'deps'
           do-not-fingerprint: true
       - copyartifact:
           project: lttng-ust_{ustversion}_build/liburcu_version={urcuversion},arch=amd64,conf=std,build=std
           which-build: last-successful
           stable: false
           filter: 'build/**'
-          target: 'deps/lttng-ust'
+          target: 'deps'
           do-not-fingerprint: true
       - shell:
           !include-raw-escape: scripts/common/coverity.sh
diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index d0511c6..9dce029 100644
--- a/jobs/lttng-ust.yaml
+++ b/jobs/lttng-ust.yaml
@@ -216,7 +216,7 @@
           which-build: last-successful
           stable: false
           filter: 'build/**'
-          target: 'deps/liburcu'
+          target: 'deps'
           do-not-fingerprint: true
       - shell:
           !include-raw-escape: scripts/common/coverity.sh
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
-- 
2.34.1