From cf24535ed7d917ab29ff9690d6bd0059e58ed0d1 Mon Sep 17 00:00:00 2001
From: Ali Maredia <amaredia@redhat.com>
Date: Thu, 14 Jan 2016 13:28:21 -0500
Subject: [PATCH] cmake: cephtool-test-rados/mds/osd passing in cmake

Replaced relative paths in test/cephtool-test-mon.sh,
qa/workunits/cephtool/test.sh, and test/cephtool-test-mon.sh
to work with CEPH_FOO environment variables set in cmake.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
---
 qa/workunits/cephtool/test.sh | 4 ++--
 src/test/cephtool-test-mds.sh | 4 ++--
 src/test/cephtool-test-mon.sh | 4 ++--
 src/test/cephtool-test-osd.sh | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 85fd65ff8f2..0b60cee7f08 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -x
 
-source $(dirname $0)/../ceph-helpers.sh
+source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
 
 set -e
 set -o functrace
@@ -1078,7 +1078,7 @@ function test_mon_osd()
     ceph osd set $f
     ceph osd unset $f
   done
-  ceph osd set sortbitwise  # new backends can't handle nibblewise
+  ceph osd set sortbitwise  # new backends cant handle nibblewise
   expect_false ceph osd set bogus
   expect_false ceph osd unset bogus
 
diff --git a/src/test/cephtool-test-mds.sh b/src/test/cephtool-test-mds.sh
index 0fc21517535..8c9c88b6c42 100755
--- a/src/test/cephtool-test-mds.sh
+++ b/src/test/cephtool-test-mds.sh
@@ -16,7 +16,7 @@
 # GNU Library Public License for more details.
 #
 CEPH_CLI_TEST_DUP_COMMAND=1 \
-MDS=1 MON=1 OSD=3 CEPH_START='mon osd mds' CEPH_PORT=7200 test/vstart_wrapper.sh \
-    ../qa/workunits/cephtool/test.sh \
+MDS=1 MON=1 OSD=3 CEPH_START='mon osd mds' CEPH_PORT=7200 $CEPH_ROOT/src/test/vstart_wrapper.sh \
+    $CEPH_ROOT/qa/workunits/cephtool/test.sh \
     --test-mds \
     --asok-does-not-need-root
diff --git a/src/test/cephtool-test-mon.sh b/src/test/cephtool-test-mon.sh
index d4da5f28b8d..9c9b20147ac 100755
--- a/src/test/cephtool-test-mon.sh
+++ b/src/test/cephtool-test-mon.sh
@@ -18,7 +18,7 @@
 CEPH_CLI_TEST_DUP_COMMAND=1 \
 # uses CEPH_PORT going from 7202 7203 and 7204 because
 # it starts at 7202 and runs 3 mons (see vstart.sh)
-MON=3 OSD=3 CEPH_START='mon osd' CEPH_PORT=7202 test/vstart_wrapper.sh \
-    ../qa/workunits/cephtool/test.sh \
+MON=3 OSD=3 CEPH_START='mon osd' CEPH_PORT=7202 $CEPH_ROOT/src/test/vstart_wrapper.sh \
+    $CEPH_ROOT/qa/workunits/cephtool/test.sh \
     --test-mon \
     --asok-does-not-need-root
diff --git a/src/test/cephtool-test-osd.sh b/src/test/cephtool-test-osd.sh
index c016d24b250..13b0774a705 100755
--- a/src/test/cephtool-test-osd.sh
+++ b/src/test/cephtool-test-osd.sh
@@ -16,7 +16,7 @@
 # GNU Library Public License for more details.
 #
 CEPH_CLI_TEST_DUP_COMMAND=1 \
-MON=1 OSD=3 CEPH_START='mon osd' CEPH_PORT=7201 test/vstart_wrapper.sh \
-    ../qa/workunits/cephtool/test.sh \
+MON=1 OSD=3 CEPH_START='mon osd' CEPH_PORT=7201 $CEPH_ROOT/src/test/vstart_wrapper.sh \
+    $CEPH_ROOT/qa/workunits/cephtool/test.sh \
     --test-osd \
     --asok-does-not-need-root