X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-ust-benchmarks%2Fbuild.sh;h=e66040c07e5b0134d8475d8eee8114f42f7e31fb;hb=HEAD;hp=10b1c05043c4af51ed283dbbe16812fb33888c20;hpb=b3fc12e8b170534e0f57eae1937f91abcd652280;p=lttng-ci.git

diff --git a/scripts/lttng-ust-benchmarks/build.sh b/scripts/lttng-ust-benchmarks/build.sh
index 10b1c05..e66040c 100644
--- a/scripts/lttng-ust-benchmarks/build.sh
+++ b/scripts/lttng-ust-benchmarks/build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -exu
+#!/bin/bash
 #
 # Copyright (C) 2015, Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
 #               2016, Michael Jeanson <mjeanson@efficios.com>
@@ -16,6 +16,8 @@
 # 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
+
 SRCDIR="$WORKSPACE/src/$PROJECT_NAME"
 
 # Create build directory
@@ -23,7 +25,7 @@ rm -rf "$WORKSPACE/build"
 mkdir -p "$WORKSPACE/build"
 
 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]))')
 
 # liburcu
 URCU_INCS="$WORKSPACE/deps/liburcu/build/include/"
@@ -46,7 +48,7 @@ TOOLS_BINS="$WORKSPACE/deps/lttng-tools/build/bin/"
 TOOLS_PY="$WORKSPACE/deps/lttng-tools/build/lib/python$P3_VERSION/site-packages/"
 
 rm -rf "$WORKSPACE/deps/lttng-modules"
-git clone git://github.com/lttng/lttng-modules.git "$WORKSPACE/deps/lttng-modules"
+git clone https://github.com/lttng/lttng-modules.git "$WORKSPACE/deps/lttng-modules"
 
 export CFLAGS="-I$URCU_INCS -I$UST_INCS"
 export LDFLAGS="-L$URCU_LIBS -L$UST_LIBS"
@@ -54,14 +56,15 @@ export LD_LIBRARY_PATH="$URCU_LIBS:$UST_LIBS:$BABEL_LIBS:$TOOLS_LIBS:${LD_LIBRAR
 export PYTHONPATH="$TOOLS_PY:$BABEL_PY:${PYTHONPATH:-}"
 export PATH="$TOOLS_BINS:$UST_BINS:$PATH"
 export LTTNG_MODULES_DIR="$WORKSPACE/deps/lttng-modules/"
+export PKG_CONFIG_PATH="$UST_LIBS/pkgconfig"
 
 export LTTNG_SESSION_CONFIG_XSD_PATH="$WORKSPACE/deps/lttng-tools/build/share/xml/lttng"
 export LTTNG_CONSUMERD64_BIN="$WORKSPACE/deps/lttng-tools/build/lib/lttng/libexec/lttng-consumerd"
 
 cd "$SRCDIR"
 
-make
+make PYTHON="$PYTHON3"
 
-./benchmarks.py
+"$PYTHON3" ./benchmarks.py
 
 # EOF