LU-3513 tests: sanity 54a, 64b: remove useless check

Tests sanity 54a, 64b are skipped if started not from lustre/tests
directory because of incorrect check that $SOCKSERVER, $SOCKCLIENT,
oos.sh exist.

Patch removes the check of the files which are part of lustre/tests.
Error messages are added to indicate what went wrong.

Signed-off-by: Elena Gryaznova <elena_gryaznova@xyratex.com>
Xyratex-bug-id: MRP-982
Signed-off-by: James Nunez <james.a.nunez@intel.com>
Change-Id: I629d8085da393fa9c986076a9913296696444ad0
Reviewed-on: http://review.whamcloud.com/6782
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.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 11c521b..a679db8 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -3853,13 +3853,11 @@ test_53() {
 run_test 53 "verify that MDS and OSTs agree on pre-creation ===="
 
 test_54a() {
 run_test 53 "verify that MDS and OSTs agree on pre-creation ===="
 
 test_54a() {

-       [ ! -f "$SOCKETSERVER" ] &&
-               skip_env "no socketserver, skipping" && return
-       [ ! -f "$SOCKETCLIENT" ] &&
-               skip_env "no socketclient, skipping" && return
-       $SOCKETSERVER $DIR/socket
-       $SOCKETCLIENT $DIR/socket || error "$SOCKETCLIENT $DIR/socket failed"
-       $MUNLINK $DIR/socket
+       $SOCKETSERVER $DIR/socket ||
+               error "$SOCKETSERVER $DIR/socket failed: $?"
+       $SOCKETCLIENT $DIR/socket ||
+               error "$SOCKETCLIENT $DIR/socket failed: $?"
+       $MUNLINK $DIR/socket || error "$MUNLINK $DIR/socket failed: $?"

 }
 run_test 54a "unix domain socket test =========================="
 
 }
 run_test 54a "unix domain socket test =========================="
 


@@ -4753,8 +4751,7 @@ run_test 64a "verify filter grant calculations (in kernel) ====="
 
 test_64b () {
        [ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 
 test_64b () {
        [ $PARALLEL == "yes" ] && skip "skip parallel run" && return

-       [ ! -f oos.sh ] && skip_env "missing subtest oos.sh" && return
-       sh oos.sh $MOUNT
+       sh oos.sh $MOUNT || error "oos.sh failed: $?"

 }
 run_test 64b "check out-of-space detection on client ==========="
 
 }
 run_test 64b "check out-of-space detection on client ==========="