qa/workunits: adjust path to ceph-helpers.sh

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/workunits/ceph-disk/ceph-disk.sh b/qa/workunits/ceph-disk/ceph-disk.sh
index 7a795b925d68cb8e70f0fd1f7f3c7a68b847c8a1..bbb93f07829c20ac3cf2582662059f0213195b1c 100755 (executable)
--- a/qa/workunits/ceph-disk/ceph-disk.sh
+++ b/qa/workunits/ceph-disk/ceph-disk.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
-if [ -f $(dirname $0)/../ceph-helpers-root.sh ]; then
-    source $(dirname $0)/../ceph-helpers-root.sh
+if [ -f $(dirname $0)/../../standalone/ceph-helpers-root.sh ]; then
+    source $(dirname $0)/../../standalone/ceph-helpers-root.sh
 else
-    echo "$(dirname $0)/../ceph-helpers-root.sh does not exist."
+    echo "$(dirname $0)/../../standalone/ceph-helpers-root.sh does not exist."
     exit 1
 fi
 

diff --git a/qa/workunits/rbd/journal.sh b/qa/workunits/rbd/journal.sh
index 4d9b8063a60d089c8ca44426e799ab4c94c23a35..60b5a41038f15c87973ae3a77cb22cc902eecc4c 100755 (executable)
--- a/qa/workunits/rbd/journal.sh
+++ b/qa/workunits/rbd/journal.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-. $(dirname $0)/../ceph-helpers.sh
+. $(dirname $0)/../../standalone/ceph-helpers.sh
 
 function list_tests()
 {

diff --git a/qa/workunits/rbd/rbd-nbd.sh b/qa/workunits/rbd/rbd-nbd.sh
index 333e3d77c8bb048eeea37447ad9c58d2922c025d..524f8bd3fc250c2e926a4dd7973346f41c68d16c 100755 (executable)
--- a/qa/workunits/rbd/rbd-nbd.sh
+++ b/qa/workunits/rbd/rbd-nbd.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 
-. $(dirname $0)/../ceph-helpers.sh
+. $(dirname $0)/../../standalone/ceph-helpers.sh
 
 POOL=rbd
 IMAGE=testrbdnbd$$

diff --git a/qa/workunits/rbd/test_admin_socket.sh b/qa/workunits/rbd/test_admin_socket.sh
index ec8764c37dd722f63660ca5746ceea306d06d16c..9135c2ecefcf19c4374453fb4e17693ea441a443 100755 (executable)
--- a/qa/workunits/rbd/test_admin_socket.sh
+++ b/qa/workunits/rbd/test_admin_socket.sh
@@ -4,7 +4,7 @@ TMPDIR=/tmp/rbd_test_admin_socket$$
 mkdir $TMPDIR
 trap "rm -fr $TMPDIR" 0
 
-. $(dirname $0)/../ceph-helpers.sh
+. $(dirname $0)/../../standalone/ceph-helpers.sh
 
 function expect_false()
 {