X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Facceptance-small.sh;h=67cd60b45fca58fb55309df6d502e9ba8c580078;hp=7645795781bde2961cb94bab07803afa7613b1a2;hb=0a714ba01bbcdb43fa2d07e88652be2b8fb1c52f;hpb=135e657693b49b4d58f1b3afa6d4f3cc3346de99

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index 7645795..67cd60b 100755
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -23,7 +23,7 @@ fi
 [ "$DEBUG_OFF" ] || DEBUG_OFF="eval lctl set_param debug=\"$DEBUG_LVL\""
 [ "$DEBUG_ON" ] || DEBUG_ON="eval lctl set_param debug=0x33f0484"
 
-export TESTSUITE_LIST="RUNTESTS SANITY DBENCH BONNIE IOZONE FSX SANITYN LFSCK LIBLUSTRE RACER REPLAY_SINGLE CONF_SANITY RECOVERY_SMALL REPLAY_OST_SINGLE REPLAY_DUAL REPLAY_VBR INSANITY SANITY_QUOTA SANITY_SEC SANITY_GSS PERFORMANCE_SANITY LARGE_SCALE RECOVERY_MDS_SCALE RECOVERY_DOUBLE_SCALE RECOVERY_RANDOM_SCALE PARALLEL_SCALE LREPLICATE_TEST"
+export TESTSUITE_LIST="RUNTESTS SANITY DBENCH BONNIE IOZONE FSX SANITYN LFSCK LIBLUSTRE RACER REPLAY_SINGLE CONF_SANITY RECOVERY_SMALL REPLAY_OST_SINGLE REPLAY_DUAL REPLAY_VBR INSANITY SANITY_QUOTA SANITY_SEC SANITY_GSS PERFORMANCE_SANITY LARGE_SCALE RECOVERY_MDS_SCALE RECOVERY_DOUBLE_SCALE RECOVERY_RANDOM_SCALE PARALLEL_SCALE LREPLICATE_TEST METADATA_UPDATES OST_POOLS SANITY_BENCHMARK"
 
 if [ "$ACC_SM_ONLY" ]; then
     for O in $TESTSUITE_LIST; do
@@ -110,11 +110,6 @@ for NAME in $CONFIGS; do
 	export NAME MOUNT START CLEAN
 	. $LUSTRE/tests/cfg/$NAME.sh
 
-	if [ ! -f /lib/modules/$(uname -r)/kernel/fs/lustre/mds.ko -a \
-	    ! -f `dirname $0`/../mds/mds.ko ]; then
-	    export CLIENTMODSONLY=true
-	fi
-	
 	assert_env mds_HOST MDS_MKFS_OPTS 
 	assert_env ost_HOST OST_MKFS_OPTS OSTCOUNT
 	assert_env FSNAME MOUNT MOUNT2
@@ -363,6 +358,12 @@ for NAME in $CONFIGS; do
 	fi
 done
 
+if [ "$SANITY_BENCHMARK" != "no" ]; then
+        title sanity-benchmark
+	bash sanity-benchmark.sh
+	SANITY_BENCHMARK="done"
+fi
+
 [ "$REPLAY_SINGLE" != "no" ] && skip_remmds replay-single && REPLAY_SINGLE=no && MSKIPPED=1
 if [ "$REPLAY_SINGLE" != "no" ]; then
         title replay-single
@@ -438,7 +439,6 @@ if [ "$SANITY_GSS" != "no" ]; then
 fi
 
 
-echo replication sanity: $LREPLICATE_TEST
 [ "$LREPLICATE_TEST" != "no" ] && skip_remmds lreplicate-test && LREPLICATE_TEST=no && MSKIPPED=1
 [ "$LREPLICATE_TEST" != "no" ] && skip_remost lreplicate-test && LREPLICATE_TEST=no && OSKIPPED=1
 if [ "$LREPLICATE_TEST" != "no" ]; then
@@ -447,6 +447,14 @@ if [ "$LREPLICATE_TEST" != "no" ]; then
         LREPLICATE_TEST="done"
 fi
 
+[ "$OST_POOLS" != "no" ] && skip_remmds ost-pools && OST_POOLS=no && MSKIPPED=1
+[ "$OST_POOLS" != "no" ] && skip_remost ost-pools && OST_POOLS=no && OSKIPPED=1
+if [ "$OST_POOLS" != "no" ]; then
+        title ost-pools
+        bash ost-pools.sh
+        OST_POOLS="done"
+fi
+
 
 [ "$SLOW" = no ] && PERFORMANCE_SANITY="no"
 [ -x "$MDSRATE" ] || PERFORMANCE_SANITY="no"
@@ -494,6 +502,12 @@ if [ "$PARALLEL_SCALE" != "no" ]; then
         PARALLEL_SCALE="done"
 fi
 
+if [ "$METADATA_UPDATES" != "no" ]; then
+        title metadata-updates
+        bash metadata-updates.sh
+        METADATA_UPDATES="done"
+fi
+
 RC=$?
 title FINISHED
 echo "Finished at `date` in $((`date +%s` - $STARTTIME))s"