From: David Zafman <dzafman@redhat.com>
Date: Thu, 7 Apr 2016 23:04:48 +0000 (-0700)
Subject: test: Find ceph command as CEPH_TOOL like rados command
X-Git-Tag: v11.0.0~690
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=89edda8494b7a2b8c65aca4703d69fdcfc11a236;p=ceph.git

test: Find ceph command as CEPH_TOOL like rados command

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/qa/workunits/rados/test_rados_tool.sh b/qa/workunits/rados/test_rados_tool.sh
index 1368d92cc4a6..54103a70efb3 100755
--- a/qa/workunits/rados/test_rados_tool.sh
+++ b/qa/workunits/rados/test_rados_tool.sh
@@ -55,6 +55,10 @@ RADOS_TOOL="`readlink -f \"$DNAME/../rados\"`"
 if ! test -f $RADOS_TOOL ; then
     RADOS_TOOL=$(which rados)
 fi
+CEPH_TOOL="`readlink -f \"$DNAME/../ceph\"`"
+if ! test -f $CEPH_TOOL ; then
+    RADOS_TOOL=$(which ceph)
+fi
 KEEP_TEMP_FILES=0
 POOL=trs_pool
 POOL_CP_TARGET=trs_pool.2
@@ -306,11 +310,11 @@ test_xattr() {
 }
 test_rmobj() {
     p=`uuidgen`
-    ceph osd pool create $p 1
-    ceph osd pool set-quota $p max_objects 1
+    $CEPH_TOOL osd pool create $p 1
+    $CEPH_TOOL osd pool set-quota $p max_objects 1
     V1=`mktemp fooattrXXXXXXX`
     rados put $OBJ $V1 -p $p
-    while ! ceph osd dump | grep 'full max_objects'
+    while ! $CEPH_TOOL osd dump | grep 'full max_objects'
     do
 	sleep 2
     done