From 83d3cc76f3d4bc7b2be3b61cc1fd20f2cd5bbf85 Mon Sep 17 00:00:00 2001 From: Marian Csontos Date: Mon, 2 Nov 2015 12:52:30 +0100 Subject: [PATCH] test: Run pytest with installed libs --- test/api/pytest.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/test/api/pytest.sh b/test/api/pytest.sh index 7ede416f2..8a8d0848d 100644 --- a/test/api/pytest.sh +++ b/test/api/pytest.sh @@ -30,15 +30,21 @@ aux prepare_dmeventd # gdb -ex r --args python FULL_PATH/lvm2/test/api/python_lvm_unit.py -v TestLvm.test_lv_active_inactive #Locate the python binding library to use. -python_lib=$(find $abs_top_builddir -name lvm.so) -# Unable to test python bindings if library not available -test -n "$python_lib" || skip +if [[ -n $abs_top_builddir ]]; then + python_lib=$(find $abs_top_builddir -name lvm.so) + # Unable to test python bindings if library not available + test -n "$python_lib" || skip "lvm2-python-libs not built" + + export PYTHONPATH=$(dirname $python_lib):$PYTHONPATH +elif rpm -q lvm2-python-libs &>/dev/null; then + true +else + skip "lvm2-python-libs neither built nor installed" +fi #If you change this change the unit test case too. aux prepare_pvs 6 -export PYTHONPATH=$(dirname $python_lib):$PYTHONPATH - #Setup which devices the unit test can use. export PY_UNIT_PVS=$(cat DEVICES)