]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
test/ceph-disk.sh: resolve symlinks before check 3441/head
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Thu, 4 Sep 2014 10:23:27 +0000 (12:23 +0200)
committerLoic Dachary <ldachary@redhat.com>
Wed, 21 Jan 2015 20:04:29 +0000 (21:04 +0100)
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

src/test/ceph-disk.sh

index 668319c55a089a21e57f6cde901278849f6057bb..cefb8563d0dfb9a0bbe7a4a39550c17fa13496cc 100755 (executable)
@@ -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