From 005e4b431402c1bb007fd5c97a86348a4763bc5c Mon Sep 17 00:00:00 2001 From: Ali Maredia Date: Wed, 13 Jan 2016 19:22:38 -0500 Subject: [PATCH] cmake: working on cephtool-test-rados.sh test Replaced relative paths in test/cephtool-test-rados.sh, qa/workunits/rados/test_rados_tool.sh, src/test/vstart_wrapper.sh, with CEPH_FOO environment variables set in cmake. Also edited the CMake path finding logic in vstart.sh with the CEPH_FOO variables. 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/cephtool-test-rados.sh | 4 ++-- src/test/vstart_wrapper.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/cephtool-test-rados.sh b/src/test/cephtool-test-rados.sh index 8f9b55191f07c..402c1c5ff9458 100755 --- a/src/test/cephtool-test-rados.sh +++ b/src/test/cephtool-test-rados.sh @@ -15,5 +15,5 @@ # GNU Library Public License for more details. # CEPH_CLI_TEST_DUP_COMMAND=1 \ -MON=1 OSD=3 CEPH_START='mon osd' CEPH_PORT=7205 test/vstart_wrapper.sh \ - test/test_rados_tool.sh +MON=1 OSD=3 CEPH_START='mon osd' CEPH_PORT=7205 $CEPH_ROOT/src/test/vstart_wrapper.sh \ + $CEPH_ROOT/src/test/test_rados_tool.sh diff --git a/src/test/vstart_wrapper.sh b/src/test/vstart_wrapper.sh index 9ce29f3159538..4e54868b157df 100755 --- a/src/test/vstart_wrapper.sh +++ b/src/test/vstart_wrapper.sh @@ -16,7 +16,7 @@ # GNU Library Public License for more details. # -source ../qa/workunits/ceph-helpers.sh +source $CEPH_ROOT/qa/workunits/ceph-helpers.sh export CEPH_VSTART_WRAPPER=1 export CEPH_DIR="$PWD/testdir/test-$CEPH_PORT" @@ -30,7 +30,7 @@ function vstart_setup() trap "teardown $CEPH_DIR" EXIT export LC_ALL=C # some tests are vulnerable to i18n export PATH="$(pwd):${PATH}" - ./vstart.sh \ + $CEPH_ROOT/src/vstart.sh \ -o 'paxos propose interval = 0.01' \ -n -l $CEPH_START || return 1 export CEPH_CONF=$CEPH_DIR/ceph.conf -- 2.39.5