b=12499

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

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index e1dcda2..0cb9483 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -1924,7 +1924,7 @@ run_test 43c "md5sum of copy into lustre========================"
 test_44() {
        [  "$OSTCOUNT" -lt "2" ] && skip "skipping 2-stripe test" && return
        dd if=/dev/zero of=$DIR/f1 bs=4k count=1 seek=1023
-       dd if=$DIR/f1 bs=4k count=1
+       dd if=$DIR/f1 bs=4k count=1 > /dev/null
 }
 run_test 44 "zero length read from a sparse stripe ============="
 
@@ -2039,8 +2039,8 @@ test_48a() { # bug 2399
                touch .foo || error "'touch .foo' failed after recreating cwd"
                mkdir .bar || error "'mkdir .foo' failed after recreating cwd"
        fi
-       ls . || error "'ls .' failed after recreating cwd"
-       ls .. || error "'ls ..' failed after removing cwd"
+       ls . > /dev/null || error "'ls .' failed after recreating cwd"
+       ls .. > /dev/null || error "'ls ..' failed after removing cwd"
        cd . || error "'cd .' failed after recreating cwd"
        mkdir . && error "'mkdir .' worked after recreating cwd"
        rmdir . && error "'rmdir .' worked after recreating cwd"
@@ -2060,8 +2060,8 @@ test_48b() { # bug 2399
                touch .foo && error "'touch .foo' worked after removing cwd"
                mkdir .foo && error "'mkdir .foo' worked after removing cwd"
        fi
-       ls . && error "'ls .' worked after removing cwd"
-       ls .. || error "'ls ..' failed after removing cwd"
+       ls . > /dev/null && error "'ls .' worked after removing cwd"
+       ls .. > /dev/null || error "'ls ..' failed after removing cwd"
        cd . && error "'cd .' worked after removing cwd"
        mkdir . && error "'mkdir .' worked after removing cwd"
        rmdir . && error "'rmdir .' worked after removing cwd"
@@ -2604,7 +2604,7 @@ run_test 63 "Verify oig_wait interruption does not crash ======="
 # bug 2248 - async write errors didn't return to application on sync
 # bug 3677 - async write errors left page locked
 test_63b() {
-       DBG_SAVE="`sysctl -n lnet.debug`"
+       debugsave
        sysctl -w lnet.debug=-1
 
        # ensure we have a grant to do async writes
@@ -2614,15 +2614,11 @@ test_63b() {
        #define OBD_FAIL_OSC_BRW_PREP_REQ        0x406
        sysctl -w lustre.fail_loc=0x80000406
        multiop $DIR/$tfile Owy && \
-               $LCTL dk /tmp/test63b.debug && \
-               sysctl -w lnet.debug="$DBG_SAVE" && \
                error "sync didn't return ENOMEM"
        sync; sleep 2; sync     # do a real sync this time to flush page
        grep locked $LPROC/llite/*/dump_page_cache && \
-               $LCTL dk /tmp/test63b.debug && \
-               sysctl -w lnet.debug="$DBG_SAVE" && \
                error "locked page left in cache after async error" || true
-       sysctl -w lnet.debug="$DBG_SAVE"
+       debugrestore
 }
 run_test 63b "async write errors should be returned to fsync ==="