merge b_devel into HEAD. Includes:

[fs/lustre-release.git] / lustre / tests / local.sh

diff --git a/lustre/tests/local.sh b/lustre/tests/local.sh
index 3be79e1..2132801 100755 (executable)
--- a/lustre/tests/local.sh
+++ b/lustre/tests/local.sh
@@ -1,16 +1,39 @@
+
 #!/bin/bash
 
-config=local.xml
-LMC=../utils/lmc
+config=${1:-local.xml}
+
+LMC="${LMC:-../utils/lmc} -m $config"
+TMP=${TMP:-/tmp}
+
+MDSDEV=${MDSDEV:-$TMP/mds1}
+MDSSIZE=${MDSSIZE:-50000}
+
+OSTDEV=${OSTDEV:-$TMP/ost1}
+OSTSIZE=${OSTSIZE:-200000}
+
+kver=`uname -r | cut -d "." -f 1,2`
+
+case $kver in
+  2.4) FSTYPE="--fstype=extN"  ;;
+  2.5) FSTYPE="--fstype=ext3"  ;;
+  *) echo "Kernel version $kver not supported"
+     exit 1
+     ;;
+esac
+
+
+rm -f $config
 
 # create nodes
-${LMC} -o $config --node localhost --net localhost tcp || exit 1
+${LMC} --add node --node localhost || exit 10
+${LMC} --add net --node  localhost --nid localhost --nettype tcp || exit 11
 
 # configure mds server
-${LMC} -m $config --format  --node localhost --mds mds1 /tmp/mds1 50000 || exit 2
+${LMC} --add mds  --node localhost --mds mds1 $FSTYPE --dev $MDSDEV --size $MDSSIZE || exit 20
 
 # configure ost
-${LMC} -m $config --format --node localhost --ost /tmp/ost1 100000 || exit 3
+${LMC} --add ost --node localhost --ost obd1 $FSTYPE --dev $OSTDEV --size  $OSTSIZE || exit 30
 
 # create client config
-${LMC} -m $config --node localhost --mtpt /mnt/lustre mds1 OSC_localhost || exit 4
+${LMC} --add mtpt --node localhost --path /mnt/lustre --mds mds1 --ost obd1 || exit 40