LU-3507 tests: fix sanity test_60a to check run-llog.sh on mgs

Test sanity 60a is skipped if started not from lustre/tests directory.
Test checks run-llog.sh on client, while run-llog.sh is ran on mgs.

This patch checks that run-llog.sh exists on mgs.

Signed-off-by: Elena Gryaznova <elena_gryaznova@xyratex.com>
Xyratex-bug-id: MRP-732
Change-Id: I8692e318bb623a8ed9fbaa2a6695c87dc8efeb9e
Reviewed-on: http://review.whamcloud.com/6780
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 25d6eb8..11c521b 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -4624,7 +4624,8 @@ TEST60_HEAD="test_60 run $RANDOM"
 test_60a() {
        [ $PARALLEL == "yes" ] && skip "skip parallel run" && return
        remote_mgs_nodsh && skip "remote MGS with nodsh" && return
 test_60a() {
        [ $PARALLEL == "yes" ] && skip "skip parallel run" && return
        remote_mgs_nodsh && skip "remote MGS with nodsh" && return

-        [ ! -f run-llog.sh ] && skip_env "missing subtest run-llog.sh" && return
+       do_facet mgs "! which run-llog.sh &> /dev/null" &&
+               skip_env "missing subtest run-llog.sh" && return

        log "$TEST60_HEAD - from kernel mode"
        do_facet mgs sh run-llog.sh
 }
        log "$TEST60_HEAD - from kernel mode"
        do_facet mgs sh run-llog.sh
 }