From: Yuval Lifshitz <ylifshit@redhat.com>
Date: Mon, 4 Apr 2022 14:27:29 +0000 (+0300)
Subject: test/multisite: dont use path when mrun outside of src tree
X-Git-Tag: v18.0.0~1098^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2e0fbd0ba657488d9b406d3e8353651ba8b0325f;p=ceph.git

test/multisite: dont use path when mrun outside of src tree

when running in teuthology we should take the binaries
from the machine without specifying a path

Fixes: https://tracker.ceph.com/issues/54416

Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
---

diff --git a/src/mrun b/src/mrun
index ba6f8cece41fc..07a9887fdf564 100755
--- a/src/mrun
+++ b/src/mrun
@@ -5,26 +5,25 @@
 root=`dirname $0`
 run_name=$1
 command=$2
-CEPH_BIN=$root
-
-[[ "$run_name" == "noname" ]] && CEPH_CONF_PATH=$root || CEPH_CONF_PATH=$root/run/$run_name
+CEPH_BIN=""
+CEPH_CONF_PATH="/etc/ceph/"
 
 [ -z "$BUILD_DIR" ] && BUILD_DIR=build
 
 if [ -e CMakeCache.txt ]; then
-    CEPH_BIN=$PWD/bin
-    [[ "$run_name" == "noname" ]] && CEPH_CONF_PATH=$PWD || CEPH_CONF_PATH=$PWD/run/$run_name
+    CEPH_BIN=$PWD/bin/
+    [[ "$run_name" == "noname" ]] && CEPH_CONF_PATH=$PWD/ || CEPH_CONF_PATH=$PWD/run/$run_name/
 elif [ -e $root/../${BUILD_DIR}/CMakeCache.txt ]; then
     cd $root/../${BUILD_DIR}
-    CEPH_BIN=$PWD/bin
-    [[ "$run_name" == "noname" ]] && CEPH_CONF_PATH=$PWD || CEPH_CONF_PATH=$PWD/run/$run_name
+    CEPH_BIN=$PWD/bin/
+    [[ "$run_name" == "noname" ]] && CEPH_CONF_PATH=$PWD/ || CEPH_CONF_PATH=$PWD/run/$run_name/
 fi
 
 shift 2
 
 if [ "$RGW_VALGRIND" = "yes" ] && [ "$command" = "radosgw" ]; then
-    valgrind --trace-children=yes --tool=memcheck --max-threads=1024 $CEPH_BIN/$command -c $CEPH_CONF_PATH/ceph.conf "$@"
+    valgrind --trace-children=yes --tool=memcheck --max-threads=1024 "$CEPH_BIN""$command" -c "$CEPH_CONF_PATH"ceph.conf "$@"
     sleep 10
 else
-    $CEPH_BIN/$command -c $CEPH_CONF_PATH/ceph.conf "$@"
+    "$CEPH_BIN""$command" -c "$CEPH_CONF_PATH"ceph.conf "$@"
 fi