jjb: ivc: export PKG_CONFIG_PATH for urcu dependency

[lttng-ci.git] / scripts / lttng-ivc / build.sh

diff --git a/scripts/lttng-ivc/build.sh b/scripts/lttng-ivc/build.sh
index 0214648865babded3ae6c97e8857701cf63db1a1..75e4311db25c86fb278d09e179aee24b4dd5564c 100644 (file)
--- a/scripts/lttng-ivc/build.sh
+++ b/scripts/lttng-ivc/build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -exu
+#!/bin/bash -xu
 #
 # Copyright (C) 2017 - Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
 #
@@ -20,18 +20,17 @@ P3_VERSION=$($PYTHON3 -c "import sys;print(sys.version[:3])")
 
 URCU_INCS=${WORKSPACE}/deps/liburcu/build/include
 URCU_LIBS=${WORKSPACE}/deps/liburcu/build/lib
+URCU_PKG_CONFIG=${URCU_LIBS}/pkgconfig
 
 # Get liburcu setup
 export LD_LIBRARY_PATH="$URCU_LIBS:${LD_LIBRARY_PATH:-}"
 export CPPFLAGS="${CPPFLAGS:-} -I$URCU_INCS"
 export LDFLAGS="${LDFLAGS:-} -L$URCU_LIBS"
+export PKG_CONFIG_PATH="$URCU_PKG_CONFIG:${PKG_CONFIG_PATH:-}"
 
-PYENV_HOME=$WORKSPACE/.pyenv/
+# Tox does not support long path venv for whatever reason.
+PYENV_HOME=$(mktemp -d)
 
-# Delete previously built virtualenv if any
-if [ -d "$PYENV_HOME" ]; then
-    rm -rf "$PYENV_HOME"
-fi
 
 # Create virtualenv and install necessary packages
 virtualenv --system-site-packages -p $PYTHON3 "$PYENV_HOME"
@@ -49,9 +48,10 @@ export TOXWORKDIR
 cd src/
 
 # Run test suite via tox
-set +e
 tox -v -- --junit-xml="${WORKSPACE}/result.xml"
-set -e
+
+# Remove base venv
+rm -rf "$PYENV_HOME"
 
 # Save
 cp -r "$TOXWORKDIR" "${WORKSPACE}/artifacts"