vstart.sh: set PATH to include pwd

ceph-mon needs crushtool to be in PATH. Don't set if it is run
from ceph_vstart_wrapper, which already sets it as it needs.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit e08bccf377292d72463796ae1dff5d8be40d88e9)

diff --git a/src/test/vstart_wrapper.sh b/src/test/vstart_wrapper.sh
index e5061783150489432e6e34d34fc0a39a842837cd..60e8a9ed0ccb3eaa297a0606bdb2a050c9ae0332 100755 (executable)
--- a/src/test/vstart_wrapper.sh
+++ b/src/test/vstart_wrapper.sh
@@ -17,6 +17,7 @@
 
 source test/mon/mon-test-helpers.sh
 
+export CEPH_VSTART_WRAPPER=1
 export CEPH_DIR="$PWD/testdir/test-$CEPH_PORT"
 export CEPH_DEV_DIR="$CEPH_DIR/dev"
 export CEPH_OUT_DIR="$CEPH_DIR/out"
@@ -27,7 +28,7 @@ function vstart_setup()
     mkdir -p $CEPH_DEV_DIR
     trap "teardown $CEPH_DIR" EXIT
     export LC_ALL=C # some tests are vulnerable to i18n
-    export PATH=.:$PATH
+    export PATH="$(pwd):${PATH}"
     ./vstart.sh \
         -o 'paxos propose interval = 0.01' \
         -n -l $CEPH_START || return 1

diff --git a/src/vstart.sh b/src/vstart.sh
index bf863dc88ded00641671baea729955b217cc93ea..87b4a57a0c05c67a17ba9159419769aee1b03026 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -12,11 +12,14 @@ else
         [ -z $OBJCLASS_PATH ] && OBJCLASS_PATH=$CEPH_LIB/rados-classes
 fi
 
+if [ -z "${CEPH_VSTART_WRAPPER}" ]; then
+    PATH=$(pwd):$PATH
+fi
+
 export PYTHONPATH=./pybind
 export LD_LIBRARY_PATH=$CEPH_LIB
 export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
 
-
 # abort on failure
 set -e