From 841f3bdf928732a3425127bf4d401eb0c6cd8b42 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 26 Jul 2017 08:08:01 -0400 Subject: [PATCH] qa/workunits: adjust path to ceph-helpers.sh Signed-off-by: Sage Weil --- qa/workunits/ceph-disk/ceph-disk.sh | 6 +++--- qa/workunits/rbd/journal.sh | 2 +- qa/workunits/rbd/rbd-nbd.sh | 2 +- qa/workunits/rbd/test_admin_socket.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qa/workunits/ceph-disk/ceph-disk.sh b/qa/workunits/ceph-disk/ceph-disk.sh index 7a795b925d6..bbb93f07829 100755 --- 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 4d9b8063a60..60b5a41038f 100755 --- 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 333e3d77c8b..524f8bd3fc2 100755 --- 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 ec8764c37dd..9135c2ecefc 100755 --- 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() {