X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-analyses%2Fbuild.sh;h=8f06e69a1a41d002997385b83559083c3999c5dd;hb=e216783123ba9985250e6a7334c868ec35773570;hp=446245625d5076dc38f6255817df910ec4aa4436;hpb=de41e5b536a225c4cd6f8f0ac90363af5c9a3814;p=lttng-ci.git

diff --git a/scripts/lttng-analyses/build.sh b/scripts/lttng-analyses/build.sh
index 4462456..8f06e69 100755
--- a/scripts/lttng-analyses/build.sh
+++ b/scripts/lttng-analyses/build.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -exu
+#!/bin/bash
 #
 # Copyright (C) 2015 - Michael Jeanson <mjeanson@efficios.com>
 #
@@ -15,18 +15,20 @@
 # 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 -exu
+
 # Has to be set in the environment
 #CODECOV_TOKEN=""
 
 SRCDIR="src/lttng-analyses"
 
 PYTHON3="python3"
-P3_VERSION=$($PYTHON3 -c "import sys;print(sys.version[:3])")
+P3_VERSION=$($PYTHON3 -c 'import sys;v = sys.version.split()[0].split("."); print("{}.{}".format(v[0], v[1]))')
 
 BABELTRACE_DIR=$WORKSPACE/deps/babeltrace/build
 
 export LD_LIBRARY_PATH="$BABELTRACE_DIR/lib"
-export PYTHONPATH="$BABELTRACE_DIR/lib/python${P3_VERSION}/dist-packages/"
+export PYTHONPATH="$BABELTRACE_DIR/lib/python${P3_VERSION}/site-packages/"
 export PATH="$PATH:$BABELTRACE_DIR/bin"
 
 PYENV_HOME=$WORKSPACE/.pyenv/
@@ -39,18 +41,18 @@ fi
 # Create virtualenv and install necessary packages
 virtualenv --system-site-packages -p $PYTHON3 "$PYENV_HOME"
 
-set +u
+set +ux
 . "$PYENV_HOME/bin/activate"
-set -u
+set -ux
 
 pip install --quiet codecov
 pip install --quiet tox
 
+cd "$SRCDIR"
+
 # Hack for path too long in venv wrapper shebang
-TMPDIR=$(mktemp -d)
-cd "$TMPDIR"
-ln -s "$WORKSPACE/$SRCDIR" src
-cd src
+TOXWORKDIR=$(mktemp -d)
+export TOXWORKDIR
 
 # Run base test suites and long regression test suite
 for suite in py3 noutf8 pep8 longregression; do
@@ -60,3 +62,6 @@ for suite in py3 noutf8 pep8 longregression; do
 done
 
 unset TOXENV
+rm -rf "$TOXWORKDIR"
+
+# EOF