b=12499

i=Adilger
i=Alexey.Lyashkov

CLIENTMODSONLY for patchless

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index 03b742b..6eb356b 100755 (executable)
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -68,6 +68,11 @@ title() {
 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 MDSDEV
        assert_env ost_HOST OST_MKFS_OPTS OSTCOUNT

diff --git a/lustre/tests/cfg/insanity-local.sh b/lustre/tests/cfg/insanity-local.sh
index 12f65af..5d0af6b 100644 (file)
--- a/lustre/tests/cfg/insanity-local.sh
+++ b/lustre/tests/cfg/insanity-local.sh
@@ -59,8 +59,8 @@ MOUNTOPT=""
     MOUNTOPT=$MOUNTOPT" --failnode=`h2$NETTYPE $ostfailover_HOST`"
 OST_MKFS_OPTS="--ost --fsname=$FSNAME --device-size=$OSTSIZE --mgsnode=$MGSNID --param sys.timeout=$TIMEOUT $MKFSOPT $MOUNTOPT $OSTOPT"
 
-MDS_MOUNT_OPTS="-o loop"
-OST_MOUNT_OPTS="-o loop"
+MDS_MOUNT_OPTS=${MDS_MOUNT_OPTS:-"-o loop"}
+OST_MOUNT_OPTS=${OST_MOUNT_OPTS:-"-o loop"}
 MOUNT=${MOUNT:-"/mnt/lustre"}
 
 FAILURE_MODE=${FAILURE_MODE:-SOFT} # or HARD

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index b32214c..30578b6 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -162,7 +162,7 @@ load_modules() {
     load_module osc/osc
     load_module lov/lov
     load_module mgc/mgc
-    if [ -z "$CLIENTONLY" ]; then
+    if [ -z "$CLIENTONLY" ] && [ -z "$CLIENTMODSONLY" ]; then
         load_module mgs/mgs
         load_module mds/mds
         [ "$FSTYPE" = "ldiskfs" ] && load_module ../ldiskfs/ldiskfs/ldiskfs