From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 9 Aug 2016 20:11:51 +0000 (-0400)
Subject: jjb: fix lttng-analyses tox build
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=1b29d53bc7cc594d122e2eae0c1be4a738d35eef;hp=f78f03ce765eb65c3598722d5481d4b80f2f3f61;p=lttng-ci.git

jjb: fix lttng-analyses tox build

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---

diff --git a/scripts/lttng-analyses/build.sh b/scripts/lttng-analyses/build.sh
index 4462456..ef19043 100755
--- a/scripts/lttng-analyses/build.sh
+++ b/scripts/lttng-analyses/build.sh
@@ -39,18 +39,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 +60,6 @@ for suite in py3 noutf8 pep8 longregression; do
 done
 
 unset TOXENV
+rm -rf "$TOXWORKDIR"
+
+# EOF