LU-1538 tests: cleanup test output, acc-small

[fs/lustre-release.git] / lustre / tests / sanity.sh

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 071343d..1bc10ae 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -3046,7 +3046,7 @@ test_49() { # LU-1030
        local osc1_mppc=osc.$(get_osc_import_name client ost1).max_pages_per_rpc
        local orig_mppc=`$LCTL get_param -n $osc1_mppc`
        # loop until dd process exits
-       while ps ax -opid | grep -q $dd_pid; do
+       while ps ax -opid | grep -wq $dd_pid; do
                $LCTL set_param $osc1_mppc=$((RANDOM % 256 + 1))
                sleep $((RANDOM % 5 + 1))
        done
@@ -3097,28 +3097,30 @@ test_51b() {
 run_test 51b "mkdir .../t-0 --- .../t-$NUMTEST ===================="
 
 test_51ba() { # LU-993
-        local BASE=$DIR/d51b
-        # unlink all but 100 subdirectories, then check it still works
-        local LEFT=100
-        local DELETE=$((NUMTEST - LEFT))
-
-        ! [ -d "${BASE}/t-$DELETE" ] && skip "test_51b() not run" && return 0
-
-        # for ldiskfs the nlink count should be 1, but this is OSD specific
-        # and so this is listed for informational purposes only
-        log "nlink before: $(stat -c %h $BASE)"
-        unlinkmany -d $BASE/t- $DELETE ||
-                error "unlink of first $DELETE subdirs failed"
-
-        log "nlink between: $(stat -c %h $BASE)"
-        local FOUND=$(ls -l ${BASE} | wc -l)
-        FOUND=$((FOUND - 1))  # trim the first line of ls output
-        [ $FOUND -ne $LEFT ] &&
-                error "can't find subdirs: found only $FOUND/$LEFT"
-
-        unlinkmany -d $BASE/t- $DELETE $LEFT ||
-                error "unlink of second $LEFT subdirs failed"
-        log "nlink after: $(stat -c %h $BASE)"
+       local BASE=$DIR/d51b
+       # unlink all but 100 subdirectories, then check it still works
+       local LEFT=100
+       local DELETE=$((NUMTEST - LEFT))
+
+       # continue on to run this test even if 51b didn't finish,
+       # just to delete the many subdirectories created.
+       ! [ -d "${BASE}/t-1" ] && skip "test_51b() not run" && return 0
+
+       # for ldiskfs the nlink count should be 1, but this is OSD specific
+       # and so this is listed for informational purposes only
+       log "nlink before: $(stat -c %h $BASE)"
+       unlinkmany -d $BASE/t- $DELETE ||
+               error "unlink of first $DELETE subdirs failed"
+
+       log "nlink between: $(stat -c %h $BASE)"
+       local FOUND=$(ls -l ${BASE} | wc -l)
+       FOUND=$((FOUND - 1))  # trim the first line of ls output
+       [ $FOUND -ne $LEFT ] &&
+               error "can't find subdirs: found only $FOUND/$LEFT"
+
+       unlinkmany -d $BASE/t- $DELETE $LEFT ||
+               error "unlink of second $LEFT subdirs failed"
+       log "nlink after: $(stat -c %h $BASE)"
 }
 run_test 51ba "rmdir .../t-0 --- .../t-$NUMTEST"
 
@@ -4206,7 +4208,7 @@ test_65ib() { # bug12836
 run_test 65ib "getstripe -v on -1 default directory striping"
 
 test_65ic() { # bug12836
-       $LFS find -mtime -1 $MOUNT || error "find $MOUNT failed"
+       $LFS find -mtime -1 $MOUNT > /dev/null || error "find $MOUNT failed"
 }
 run_test 65ic "new find on -1 default directory striping"