From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Tue, 24 Jun 2014 17:54:17 +0000 (+0200)
Subject: test/ceph-disk.sh: fix for SUSE
X-Git-Tag: v0.83~40^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2021%2Fhead;p=ceph.git

test/ceph-disk.sh: fix for SUSE

On SUSE 'which' returns always the full path of (shell) commands and
not e.g. './ceph-conf' as on Debian. Add check also for full
path returned by which.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/test/ceph-disk.sh b/src/test/ceph-disk.sh
index 3e95bf911a5a..91e99ec4c9c3 100755
--- a/src/test/ceph-disk.sh
+++ b/src/test/ceph-disk.sh
@@ -83,7 +83,7 @@ function kill_daemons() {
 function command_fixture() {
     local command=$1
 
-    [ $(which $command) = ./$command ] || return 1
+    [ $(which $command) = ./$command ] || [ $(which $command) = $(pwd)/$command ] || return 1
 
     cat > $DIR/$command <<EOF
 #!/bin/bash