From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Thu, 4 Sep 2014 10:23:27 +0000 (+0200)
Subject: test/ceph-disk.sh: resolve symlinks before check
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a592c467aedf1963677fd0356a935882fb878817;p=ceph.git

test/ceph-disk.sh: resolve symlinks before check

Make sure symlinks are resolved in command_fixture()
before compare result of which command and the current
path.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
(cherry picked from commit 8ea86dfa7c4a3d7e089cf9d4e49586657875f851)

Conflicts:
	src/test/ceph-disk.sh
---

diff --git a/src/test/ceph-disk.sh b/src/test/ceph-disk.sh
index 668319c55a0..cefb8563d0d 100755
--- a/src/test/ceph-disk.sh
+++ b/src/test/ceph-disk.sh
@@ -85,7 +85,7 @@ function kill_daemons() {
 function command_fixture() {
     local command=$1
 
-    [ $(which $command) = ./$command ] || return 1
+    [ $(which $command) = ./$command ] || [ $(which $command) = `readlink -f $(pwd)/$command` ] || return 1
 
     cat > $DIR/$command <<EOF
 #!/bin/bash