From 08bfdb2e48b67332a7468bb44fbb280a529a020c Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Wed, 7 Dec 2016 18:46:40 +0000 Subject: Install isa-l from source when testing liberasure-master Change-Id: I93506b63f2a4f86358d5ffbca8b7360e797729d1 --- bindep.txt | 1 + tools/pip-install-with-liberasurecode.sh | 14 ++++++++++++++ tox.ini | 1 + 3 files changed, 16 insertions(+) diff --git a/bindep.txt b/bindep.txt index ea8cf54..a8f6a10 100644 --- a/bindep.txt +++ b/bindep.txt @@ -7,6 +7,7 @@ make [platform:rpm] autoconf automake libtool +yasm liberasurecode-dev [platform:dpkg] liberasurecode-devel [platform:rpm] python-dev [platform:dpkg] diff --git a/tools/pip-install-with-liberasurecode.sh b/tools/pip-install-with-liberasurecode.sh index 2be036f..7745ef8 100755 --- a/tools/pip-install-with-liberasurecode.sh +++ b/tools/pip-install-with-liberasurecode.sh @@ -3,6 +3,19 @@ if [ -z "$VIRTUAL_ENV" ]; then echo "Expected VIRTUAL_ENV to be set!" exit 1 fi + +if [ -n "$ISAL_DIR" ]; then + if [ ! -d "$ISAL_DIR" ]; then + git clone git://github.com/01org/isa-l.git "$ISAL_DIR" + fi + pushd "$ISAL_DIR" + ./autogen.sh + ./configure --prefix "$VIRTUAL_ENV" + make + make install + popd +fi + if [ -z "$LIBERASURECODE_DIR" ]; then echo "Expected LIBERASURECODE_DIR to be set!" exit 1 @@ -20,4 +33,5 @@ fi make make install popd + pip install "$@" diff --git a/tox.ini b/tox.ini index b68e8c7..56a9518 100644 --- a/tox.ini +++ b/tox.ini @@ -9,6 +9,7 @@ commands= [testenv:liberasurecode-git] setenv = LIBERASURECODE_DIR={envdir}/liberasurecode + ISAL_DIR={envdir}/isa-l passenv = LIBERASURECODE_REF install_command = {toxinidir}/tools/pip-install-with-liberasurecode.sh {opts} {packages} -- cgit v1.2.1