X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-lfsck.sh;h=55b0f5d236a23c2809b9b8bf3bb16bd0a09afbc8;hb=87e1428b792ad2a2a49db71924438a37a4537e6a;hp=aa8b38523024264def344e0be127584b6ebe0a40;hpb=5b729ad309d371ed3e1abc73eea2641dc98e1791;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sanity-lfsck.sh b/lustre/tests/sanity-lfsck.sh
index aa8b385..55b0f5d 100644
--- a/lustre/tests/sanity-lfsck.sh
+++ b/lustre/tests/sanity-lfsck.sh
@@ -3296,7 +3296,8 @@ test_26a() {
 	rm -f $DIR/$tdir/d0/foo || error "(4) Fail to unlink $DIR/$tdir/d0/foo"
 	do_facet $SINGLEMDS $LCTL set_param fail_loc=0
 
-	ls -ail $DIR/$tdir/d0/foo > /dev/null 2>&1 && "(5) 'ls' should fail"
+	ls -ail $DIR/$tdir/d0/foo > /dev/null 2>&1 &&
+		error "(5) 'ls' should fail"
 
 	echo "Trigger namespace LFSCK to repair the missing remote name entry"
 	$START_NAMESPACE -r -A ||
@@ -3343,7 +3344,8 @@ test_26b() {
 	rmdir $DIR/$tdir/d0/foo || error "(3) Fail to rmdir $DIR/$tdir/d0/foo"
 	do_facet $SINGLEMDS $LCTL set_param fail_loc=0
 
-	ls -ail $DIR/$tdir/d0/foo > /dev/null 2>&1 && "(4) 'ls' should fail"
+	ls -ail $DIR/$tdir/d0/foo > /dev/null 2>&1 &&
+		error "(4) 'ls' should fail"
 
 	echo "Trigger namespace LFSCK to repair the missing remote name entry"
 	$START_NAMESPACE -r -A ||
@@ -3392,7 +3394,7 @@ test_27a() {
 	do_facet $SINGLEMDS $LCTL set_param fail_loc=0
 
 	rm -rf $DIR/$tdir/d0 || error "(5) Fail to unlink the dir d0"
-	ls -ail $DIR/$tdir/d0 > /dev/null 2>&1 && "(6) 'ls' should fail"
+	ls -ail $DIR/$tdir/d0 > /dev/null 2>&1 && error "(6) 'ls' should fail"
 
 	echo "Trigger namespace LFSCK to repair the lost parent"
 	$START_NAMESPACE -r -A ||
@@ -3444,7 +3446,7 @@ test_27b() {
 	do_facet $SINGLEMDS $LCTL set_param fail_loc=0
 
 	rmdir $DIR/$tdir/d0 || error "(4) Fail to unlink the dir d0"
-	ls -ail $DIR/$tdir/d0 > /dev/null 2>&1 && "(5) 'ls' should fail"
+	ls -ail $DIR/$tdir/d0 > /dev/null 2>&1 && error "(5) 'ls' should fail"
 
 	echo "Trigger namespace LFSCK to repair the missing remote name entry"
 	$START_NAMESPACE -r -A ||
@@ -3681,7 +3683,7 @@ test_29c() {
 	local foofid=$($LFS path2fid $DIR/$tdir/d0/foo)
 	$LFS fid2path $DIR $foofid
 	local count2=$($LFS fid2path $DIR $foofid | wc -l)
-	[ $count2 -eq 2 ] || "(6) Fail to inject error: $count2"
+	[ $count2 -eq 2 ] || error "(6) Fail to inject error: $count2"
 
 	echo "Trigger namespace LFSCK to repair the nlink count"
 	$START_NAMESPACE -r -A ||
@@ -3770,7 +3772,7 @@ test_30() {
 
 	mount_client $MOUNT || error "(17) Fail to start client!"
 
-	stat $DIR/$tdir/foo/f0 || "(18) f0 is not recovered"
+	stat $DIR/$tdir/foo/f0 || error "(18) f0 is not recovered"
 
 	ls -ail $MOUNT/.lustre/lost+found/