jjb: lttng-modules: cleanup and add logging to PARAM builds

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

diff --git a/scripts/lttng-ivc/build.sh b/scripts/lttng-ivc/build.sh
index 83cbefc291529db55674aa1ab6ce841308cd723d..62069a4f7616fb5364f383b8044b3bb3e4d805c5 100644 (file)
--- a/scripts/lttng-ivc/build.sh
+++ b/scripts/lttng-ivc/build.sh
@@ -1,6 +1,6 @@
-#!/bin/bash -xu
+#!/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,8 +15,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/>.
 
+set -xu
+
 PYTHON3="python3"
-P3_VERSION=$($PYTHON3 -c 'import sys;v = sys.version.split()[0].split("."); print("{}.{}".format(v[0], v[1]))')
 
 # Tox does not support long path venv for whatever reason.
 PYENV_HOME=$(mktemp -d)
@@ -25,6 +26,7 @@ PYENV_HOME=$(mktemp -d)
 virtualenv --system-site-packages -p $PYTHON3 "$PYENV_HOME"
 
 set +ux
+# shellcheck disable=SC1091
 . "$PYENV_HOME/bin/activate"
 set -ux
 
@@ -34,12 +36,16 @@ 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
 tox -v -- --junit-xml="${WORKSPACE}/result.xml"
 
 # Remove base venv
+deactivate
 rm -rf "$PYENV_HOME"
 
 # Save