From 3f66da7239ba012ca88d990071eaffdb80265826 Mon Sep 17 00:00:00 2001 From: Mykola Golub Date: Sun, 3 Jul 2016 21:43:17 +0300 Subject: [PATCH] test: fix run-rbd-tests test for cmake Signed-off-by: Mykola Golub --- src/test/run-rbd-tests | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/test/run-rbd-tests b/src/test/run-rbd-tests index 187c6edf4cbc4..b4b5362694cf4 100755 --- a/src/test/run-rbd-tests +++ b/src/test/run-rbd-tests @@ -2,13 +2,18 @@ # this should be run from the src directory in the ceph.git -CEPH_SRC=$(pwd) -export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$CEPH_SRC/.libs" +source $(dirname $0)/detect-build-env-vars.sh +if [ -e CMakeCache.txt ]; then + CYTHON_MODULES_DIR=$CEPH_LIB/cython_modules +else + CYTHON_MODULES_DIR=$CEPH_SRC/build +fi + +CEPH_SRC=$CEPH_ROOT/src export PYTHONPATH="$CEPH_SRC/pybind:$CEPH_SRC/test/pybind" -for x in $CEPH_SRC/build/lib* ; do - export PYTHONPATH="${PYTHONPATH}:${x}" +for x in $CYTHON_MODULES_DIR/lib* ; do + PYTHONPATH="${PYTHONPATH}:${x}" done -PATH="$CEPH_SRC:$PATH" recreate_pool() { POOL_NAME=$1 -- 2.39.5