X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-ivc%2Fbuild.sh;h=484c6484026ba85bccf18809cc0573bbea933c31;hb=1f14ee5ac90bd7d4d7ccfcd436022ddd36e22a30;hp=0214648865babded3ae6c97e8857701cf63db1a1;hpb=c497a33456db8606961394b6b7952fc8dc156fb8;p=lttng-ci.git

diff --git a/scripts/lttng-ivc/build.sh b/scripts/lttng-ivc/build.sh
index 0214648..484c648 100644
--- a/scripts/lttng-ivc/build.sh
+++ b/scripts/lttng-ivc/build.sh
@@ -1,6 +1,6 @@
-#!/bin/bash -exu
+#!/bin/bash
 #
-# Copyright (C) 2017 - Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
+# Copyright (C) 2017 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,28 +15,18 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-PYTHON3="python3"
-P3_VERSION=$($PYTHON3 -c "import sys;print(sys.version[:3])")
-
-URCU_INCS=${WORKSPACE}/deps/liburcu/build/include
-URCU_LIBS=${WORKSPACE}/deps/liburcu/build/lib
-
-# Get liburcu setup
-export LD_LIBRARY_PATH="$URCU_LIBS:${LD_LIBRARY_PATH:-}"
-export CPPFLAGS="${CPPFLAGS:-} -I$URCU_INCS"
-export LDFLAGS="${LDFLAGS:-} -L$URCU_LIBS"
+set -xu
 
-PYENV_HOME=$WORKSPACE/.pyenv/
+PYTHON3="python3"
 
-# Delete previously built virtualenv if any
-if [ -d "$PYENV_HOME" ]; then
-    rm -rf "$PYENV_HOME"
-fi
+# Tox does not support long path venv for whatever reason.
+PYENV_HOME=$(mktemp -d)
 
 # Create virtualenv and install necessary packages
 virtualenv --system-site-packages -p $PYTHON3 "$PYENV_HOME"
 
 set +ux
+# shellcheck disable=SC1091
 . "$PYENV_HOME/bin/activate"
 set -ux
 
@@ -46,12 +36,17 @@ pip install --quiet tox
 TOXWORKDIR=$(mktemp -d)
 export TOXWORKDIR
 
-cd src/
+cd src/ || exit 1
+
+# Required to build tools < 2.11 with GCC >= 10
+export CFLAGS="-fcommon"
 
 # Run test suite via tox
-set +e
-tox -v -- --junit-xml="${WORKSPACE}/result.xml"
-set -e
+tox -v -e babeltrace -- --junit-xml="${WORKSPACE}/result.xml"
+
+# Remove base venv
+deactivate
+rm -rf "$PYENV_HOME"
 
 # Save
 cp -r "$TOXWORKDIR" "${WORKSPACE}/artifacts"