projects
/
lttng-ci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lttng-tools gerrit: temporarily disable bash debug for pattern matching
[lttng-ci.git]
/
scripts
/
lttng-ivc
/
build.sh
diff --git
a/scripts/lttng-ivc/build.sh
b/scripts/lttng-ivc/build.sh
index 0214648865babded3ae6c97e8857701cf63db1a1..8cc08acea45bc6dd532c513abde504e9df8453ad 100644
(file)
--- a/
scripts/lttng-ivc/build.sh
+++ b/
scripts/lttng-ivc/build.sh
@@
-1,4
+1,4
@@
-#!/bin/bash -
e
xu
+#!/bin/bash -xu
#
# Copyright (C) 2017 - Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
#
#
# Copyright (C) 2017 - Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
#
@@
-26,12
+26,9
@@
export LD_LIBRARY_PATH="$URCU_LIBS:${LD_LIBRARY_PATH:-}"
export CPPFLAGS="${CPPFLAGS:-} -I$URCU_INCS"
export LDFLAGS="${LDFLAGS:-} -L$URCU_LIBS"
export CPPFLAGS="${CPPFLAGS:-} -I$URCU_INCS"
export LDFLAGS="${LDFLAGS:-} -L$URCU_LIBS"
-PYENV_HOME=$WORKSPACE/.pyenv/
+# Tox does not support long path venv for whatever reason.
+PYENV_HOME=$(mktemp -d)
-# Delete previously built virtualenv if any
-if [ -d "$PYENV_HOME" ]; then
- rm -rf "$PYENV_HOME"
-fi
# Create virtualenv and install necessary packages
virtualenv --system-site-packages -p $PYTHON3 "$PYENV_HOME"
# Create virtualenv and install necessary packages
virtualenv --system-site-packages -p $PYTHON3 "$PYENV_HOME"
@@
-49,9
+46,10
@@
export TOXWORKDIR
cd src/
# Run test suite via tox
cd src/
# Run test suite via tox
-set +e
tox -v -- --junit-xml="${WORKSPACE}/result.xml"
tox -v -- --junit-xml="${WORKSPACE}/result.xml"
-set -e
+
+# Remove base venv
+rm -rf "$PYENV_HOME"
# Save
cp -r "$TOXWORKDIR" "${WORKSPACE}/artifacts"
# Save
cp -r "$TOXWORKDIR" "${WORKSPACE}/artifacts"
This page took
0.023178 seconds
and
4
git commands to generate.