* allow lmc and lconf paths to be overridden in installed scripts

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

diff --git a/lustre/tests/llecho.sh b/lustre/tests/llecho.sh
index 9a18574..f6cbad6 100644 (file)
--- a/lustre/tests/llecho.sh
+++ b/lustre/tests/llecho.sh
@@ -1,30 +1,24 @@
 #!/bin/sh
 
-SRCDIR="`dirname $0`"
-. $SRCDIR/common.sh
+config=echo.xml
+LCONF=${LCONF:-../utils/lconf}
+LMC=${LMC:-../utils/lmc}
 
-NETWORK=tcp
-LOCALHOST=localhost
 SERVER=localhost
-PORT=1234
-
-setup_portals
-setup_lustre
-
-$OBDCTL <<EOF
-device 0
-attach obdecho
-setup
-device 1
-attach ost
-setup 0
-device 2
-attach osc
-setup -1
-quit
-EOF
+CLIENT=localhost
+
+# create nodes
+$LMC -o $config --node $SERVER --net $SERVER tcp || exit 1
+$LMC -m $config --node $SERVER --obdtype=obdecho --ost || exit 2
+
+# force the osc to be configured (this is normally done when it is mounted)
+$LMC -m $config --node $CLIENT --osc OSC_$SERVER || exit 3
+
+$LCONF --gdb $config || exit 4
 
 cat <<EOF
+
 run getattr tests as:
-obdctl --device 2 test_getattr 1000000
+../utils/lctl --device \'\$OSC_$SERVER\' test_getattr 1000000
 EOF
+