X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fllecho.sh;h=a30a6b65a5280d1ddc158a4e53478b6fb8c664f0;hb=339704f578367d865a8c454fc5a5a3f4b47f0499;hp=82b2c1ea5fa943126ef5a3bb314e449ab10b68d5;hpb=32e3f2e70b8e7de4fd2bcdbcfbc1ccac74c609e6;p=fs%2Flustre-release.git

diff --git a/lustre/tests/llecho.sh b/lustre/tests/llecho.sh
index 82b2c1e..a30a6b6 100644
--- a/lustre/tests/llecho.sh
+++ b/lustre/tests/llecho.sh
@@ -1,55 +1,23 @@
 #!/bin/sh
 
-config=echo.xml
-LCONF=${LCONF:-../utils/lconf}
-LMC=${LMC:-../utils/lmc}
-
-SERVER=localhost
-CLIENT=localhost
-
-# FIXME: make LMC not require MDS for obdecho LOV
-MDSDEV=$TMP/mds1
-MDSSIZE=10000
-
-STRIPE_BYTES=65536
-STRIPES_PER_OBJ=2	# 0 means stripe over all OSTs
-
-LOV=0
-while [ "$1" ]; do
-        case $1 in
-        --lov) LOV="1" ;;
-	*) OPTS="$OPTS $1" ;;
-        esac
-        shift
-done
-
-rm -f $config
-# create nodes
-$LMC -o $config --add node --node $SERVER  || exit 1
-$LMC -m $config --add net --node $SERVER --nid $SERVER --nettype tcp || exit 2
-
-if (($LOV)); then
-    $LMC -m $config --add mds --node $SERVER --mds mds1 --dev $MDSDEV --size $MDSSIZE || exit 10
-    $LMC -m $config --add lov --lov lov1 --mds mds1 --stripe_sz $STRIPE_BYTES --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0 || exit 11
-    $LMC -m $config --add ost --node $SERVER --lov lov1 --obdtype=obdecho || exit 12
-    $LMC -m $config --add ost --node $SERVER --lov lov1 --obdtype=obdecho || exit 13
-    OBD_NAME=lov1
-else
-    $LMC -m $config --add ost --obd obd1 --node $SERVER --obdtype=obdecho || exit 2
-    OBD_NAME=obd1
-fi
+PATH=`dirname $0`/../utils:$PATH
+
+LCONF=${LCONF:-lconf}
+NAME=${NAME:-echo}
+
+config=$NAME.xml
+mkconfig=$NAME.sh
 
-if [ "$SERVER" != "$CLIENT" ]; then
-   $LMC -m $config --add node --node $CLIENT  || exit 1
-   $LMC -m $config --add node --node $CLIENT --nid $CLIENT --nettype tcp || exit 2
+if [ "$LUSTRE" ]; then
+  lustre_opt="--lustre=$LUSTRE"
 fi
 
-$LMC -m $config --add echo_client --node $CLIENT --obd ${OBD_NAME} || exit 3
+sh -x $mkconfig $config || exit 1
 
-$LCONF --reformat --gdb $OPTS $config || exit 4
+$LCONF $lustre_opt --reformat $@ $OPTS $config || exit 4
 
 cat <<EOF
 
 run getattr tests as:
-../utils/lctl --device '\$ECHO_$SERVER' test_getattr 1000000
+`dirname $0`../utils/lctl --device '\$ECHO_$SERVER' test_getattr 1000000
 EOF