From d1892706d77b0dc865610bdd6e82bf57c259b6f7 Mon Sep 17 00:00:00 2001 From: Ali Maredia Date: Tue, 12 Jan 2016 19:33:29 -0500 Subject: [PATCH] cmake: working on rados-striper.sh test Replaced relative paths in test/mon/osd-crush.sh with CEPH_VAR environment variables set in cmake. NOTE: test is not passing yet, possibly due to the filesystem. this commit is a work in progress Signed-off-by: Ali Maredia --- src/test/CMakeLists.txt | 3 ++- src/test/libradosstriper/rados-striper.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 3e37c1e213c86..0c259530abd5a 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -361,7 +361,8 @@ add_dependencies(check rbd radosgw-admin ceph_example - ceph_snappy) + ceph_snappy + cls_lock) add_ceph_test(test-ceph-helpers.sh ${CMAKE_CURRENT_SOURCE_DIR}/test-ceph-helpers.sh) add_ceph_test(erasure-decode-non-regression.sh ${CMAKE_SOURCE_DIR}/qa/workunits/erasure-code/encode-decode-non-regression.sh) diff --git a/src/test/libradosstriper/rados-striper.sh b/src/test/libradosstriper/rados-striper.sh index ed0e89208b264..a2de948b07fd3 100755 --- a/src/test/libradosstriper/rados-striper.sh +++ b/src/test/libradosstriper/rados-striper.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Library Public License for more details. # -source ../qa/workunits/ceph-helpers.sh +source $CEPH_ROOT/qa/workunits/ceph-helpers.sh function run() { local dir=$1 -- 2.39.5