From a451dc006abb298804ae418fbb3e4396fd5dbadd Mon Sep 17 00:00:00 2001 From: kalpak <kalpak> Date: Sat, 9 Aug 2008 05:57:17 +0000 Subject: [PATCH] b=10555 i=kalpak (patch by rread) fix the lines which skip fiemap tests --- lustre/tests/sanity.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index ad9da30adf..04d69b69f2 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -5149,7 +5149,7 @@ run_test 129 "test directory size limit ========================" test_130a() { filefrag_op=$(filefrag -e 2>&1 | grep "invalid option") - [ -n "$filefrag_op" ] && skip '"filefrag does not support FIEMAP" && return' + [ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return local fm_file=$DIR/$tfile lfs setstripe -s 65536 -c 1 $fm_file || error "setstripe failed on $fm_file" @@ -5186,7 +5186,7 @@ test_130b() { [ "$OSTCOUNT" -lt "2" ] && skip "skipping FIEMAP on 2-stripe file test" && return filefrag_op=$(filefrag -e 2>&1 | grep "invalid option") - [ -n "$filefrag_op" ] && skip '"filefrag does not support FIEMAP" && return' + [ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return local fm_file=$DIR/$tfile lfs setstripe -s 65536 -c 2 $fm_file || error "setstripe failed on $fm_file" @@ -5229,7 +5229,7 @@ test_130c() { [ "$OSTCOUNT" -lt "2" ] && skip "skipping FIEMAP on 2-stripe file with hole test" && return filefrag_op=$(filefrag -e 2>&1 | grep "invalid option") - [ -n "$filefrag_op" ] && skip '"filefrag does not support FIEMAP" && return' + [ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return local fm_file=$DIR/$tfile lfs setstripe -s 65536 -c 2 $fm_file || error "setstripe failed on $fm_file" @@ -5277,7 +5277,7 @@ test_130d() { [ "$OSTCOUNT" -lt "3" ] && skip "skipping FIEMAP on N-stripe file test" && return filefrag_op=$(filefrag -e 2>&1 | grep "invalid option") - [ -n "$filefrag_op" ] && skip '"filefrag does not support FIEMAP" && return' + [ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return local fm_file=$DIR/$tfile lfs setstripe -s 65536 -c $OSTCOUNT $fm_file || error "setstripe failed on $fm_file" @@ -5320,7 +5320,7 @@ test_130e() { [ "$OSTCOUNT" -lt "2" ] && skip "skipping continuation FIEMAP test" && return filefrag_op=$(filefrag -e 2>&1 | grep "invalid option") - [ -n "$filefrag_op" ] && skip '"filefrag does not support FIEMAP" && return' + [ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return local fm_file=$DIR/$tfile lfs setstripe -s 65536 -c 2 $fm_file || error "setstripe failed on $fm_file" -- GitLab