From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 3 Sep 2015 19:00:10 +0000 (-0400)
Subject: Fix scan-build job for lttng-ust
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=c9b78c7b872561ac36695aac2d44a9c5a38f1052;p=lttng-ci.git

Fix scan-build job for lttng-ust
---

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index fdce43a..cda7068 100644
--- a/jobs/lttng-ust.yaml
+++ b/jobs/lttng-ust.yaml
@@ -99,6 +99,10 @@
           artifacts: 'build/**'
           allow-empty: false
       - workspace-cleanup
+      - ircbot:
+          matrix-notifier: only-parent
+          channels:
+            - name: '#lttng'
 
 
 - job-template:
@@ -135,6 +139,13 @@
           cron: "@daily"
 
     builders:
+      - copyartifact:
+          project: liburcu_master_build/arch=x86-64,conf=std,build=std
+          which-build: last-successful
+          stable: true
+          filter: 'build/**'
+          target: 'deps/liburcu'
+          do-not-fingerprint: true
       - shell:
           !include-raw-escape scripts/lttng-ust/scan-build.sh
 
@@ -178,6 +189,7 @@
     publishers:
       - workspace-cleanup
 
+# TODO
 - job-template:
     name: lttng-ust_{version}_pylint
     defaults: lttng-ust
diff --git a/scripts/lttng-ust/scan-build.sh b/scripts/lttng-ust/scan-build.sh
index e67305a..da98d40 100755
--- a/scripts/lttng-ust/scan-build.sh
+++ b/scripts/lttng-ust/scan-build.sh
@@ -29,7 +29,15 @@ SCAN_BUILD_ARCHIVE="${WORKSPACE}/scan-build-archive"
 rm -rf $WORKSPACE/build
 mkdir -p $WORKSPACE/build
 
+# liburcu
+URCU_INCS="$WORKSPACE/deps/liburcu/build/include/"
+URCU_LIBS="$WORKSPACE/deps/liburcu/build/lib/"
+
 export CFLAGS="-O0 -g -DDEBUG"
+export CPPFLAGS="-I$URCU_INCS"
+export LDFLAGS="-L$URCU_LIBS"
+export LD_LIBRARY_PATH="$URCU_LIBS:${LD_LIBRARY_PATH:-}"
+
 PREFIX="$WORKSPACE/build"
 
 ./bootstrap