X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Freplay-single-lmv.sh;h=63ec67a5758bf14cf3fa8d66d7b57153130ce6e6;hb=ffd4523f2d50ef952112f44ffd524af991b4baed;hp=3d8501f65270b24f205e09b3e75b8cfc8fb372a0;hpb=879e8d045057941ae0a5117d096f53975ef12ad0;p=fs%2Flustre-release.git

diff --git a/lustre/tests/replay-single-lmv.sh b/lustre/tests/replay-single-lmv.sh
index 3d8501f..63ec67a 100755
--- a/lustre/tests/replay-single-lmv.sh
+++ b/lustre/tests/replay-single-lmv.sh
@@ -1,34 +1,27 @@
 #!/bin/bash
 
 set -e
-#set -v
 
-#
-# This test needs to be run on the client
-#
-
-LUSTRE=${LUSTRE:-`dirname $0`/..}
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/lmv.sh}
-
 
-# Skip these tests
-ALWAYS_EXCEPT=""
+# bug number for skipped test:
+ALWAYS_EXCEPT="REPLAY_SINGLE_LMV_EXCEPT "
 build_test_filter
 
 SETUP=${SETUP:-"setup"}
 CLEANUP=${CLEANUP:-"stopall"}
 
 if [ "$ONLY" == "cleanup" ]; then
-    lctl set_param debug=0 || true
-    $CLEANUP
-    exit 0
+	lctl set_param debug=0 || true
+	$CLEANUP
+	exit 0
 fi
 
 setup() {
-    formatall
-    setupall
+	formatall
+	setupall
 }
 
 $SETUP
@@ -40,8 +33,9 @@ fi
 mkdir -p $DIR
 
 # LU-482 Avert LVM and VM inability to flush caches in pre .33 kernels
-if [ $LINUX_VERSION_CODE -lt $(kernel_version 2 6 33) ]; then
-    sync; sleep 5; sync; sleep 5; sync; sleep 5
+if [ $LINUX_VERSION_CODE -lt $(version_code 2.6.33) ]; then
+    sync
+    do_facet $SINGLEMDS sync
 fi
 
 test_0() {
@@ -112,6 +106,6 @@ test_3b() {
 }
 run_test 3b "mkdir cross-node dir (fail mds with inode)"
 
-equals_msg test complete, cleaning up
+complete $SECONDS
 $CLEANUP