From: Thomas Bechtold Date: Wed, 6 Nov 2019 15:10:53 +0000 (+0100) Subject: qa/standalone/test_ceph_daemon: Allow running from root dir X-Git-Tag: v15.1.0~1018^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b04b8f73980be960e71fedcb0353d1f344ad2138;p=ceph.git qa/standalone/test_ceph_daemon: Allow running from root dir Allow running the script from root directory via: ./qa/standalone/test_ceph_daemon.sh Signed-off-by: Thomas Bechtold --- diff --git a/qa/standalone/test_ceph_daemon.sh b/qa/standalone/test_ceph_daemon.sh index 18ad8cd590c2..90380a8925cf 100755 --- a/qa/standalone/test_ceph_daemon.sh +++ b/qa/standalone/test_ceph_daemon.sh @@ -6,6 +6,7 @@ IMAGE='ceph/daemon-base:latest-master-devel' [ -z "$SUDO" ] && SUDO=sudo if [ -z "$CEPH_DAEMON" ]; then + [ -x src/ceph-daemon ] && CEPH_DAEMON=src/ceph-daemon [ -x ../src/ceph-daemon ] && CEPH_DAEMON=../src/ceph-daemon [ -x ./ceph-daemon ] && CEPH_DAEMON=.ceph-daemon which ceph-daemon && CEPH_DAEMON=$(which ceph-daemon)