- added non-fatal qswnal insertion to common.sh

- fixed up various scripts to use the common.sh variables

diff --git a/lustre/tests/common.sh b/lustre/tests/common.sh
index fced05a..c99b774 100644 (file)
--- a/lustre/tests/common.sh
+++ b/lustre/tests/common.sh
@@ -55,6 +55,7 @@ setup() {
     [ -c /dev/portals ] || mknod /dev/portals c 10 240
 
     insmod $R/usr/src/portals/linux/oslib/portals.o || exit -1
+    insmod $R/usr/src/portals/linux/qswnal/kqswnal.o
     insmod $R/usr/src/portals/linux/socknal/ksocknal.o || exit -1
 
     $ACCEPTOR 1234 &

diff --git a/lustre/tests/lldlm.sh b/lustre/tests/lldlm.sh
index e3d3e6f..1ab3d24 100755 (executable)
--- a/lustre/tests/lldlm.sh
+++ b/lustre/tests/lldlm.sh
@@ -6,9 +6,9 @@ SRCDIR="`dirname $0`"
 setup_ldlm
 
 mknod /dev/obd c 10 241
-echo 8191 > /proc/sys/portals/debug
+echo 0xffffffff > /proc/sys/portals/debug
 
-$R/usr/src/obd/utils/obdctl <<EOF
+$OBDCTL <<EOF
 device 0
 attach ldlm
 setup

diff --git a/lustre/tests/llmount-client.sh b/lustre/tests/llmount-client.sh
index 4c07611..1328e74 100644 (file)
--- a/lustre/tests/llmount-client.sh
+++ b/lustre/tests/llmount-client.sh
@@ -4,36 +4,25 @@ export PATH=/sbin:/usr/sbin:$PATH
 SRCDIR="`dirname $0`"
 . $SRCDIR/common.sh
 
-SERVER=compila
+NETWORK=elan
+LOCALHOST=4
+SERVER=5
 
-mknod /dev/portals c 10 240
-
-insmod $R/usr/src/portals/linux/oslib/portals.o
-# insmod $R/usr/src/portals/linux/socknal/ksocknal.o
-insmod $R/usr/src/portals/linux/qswnal/kqswnal.o
+setup
 
 $PTLCTL <<EOF
-mynid
-setup elan 
-connect 5
+setup $NETWORK
+mynid $LOCALHOST
+connect $LOCALHOST
 add_uuid self
+connect $SERVER
 add_uuid mds
+add_uuid ost
 EOF
 
-insmod $R/usr/src/obd/rpc/ptlrpc.o
-insmod $R/usr/src/obd/class/obdclass.o 
-insmod $R/usr/src/obd/ext2obd/obdext2.o
-insmod $R/usr/src/obd/ost/ost.o
-insmod $R/usr/src/obd/osc/osc.o
-insmod $R/usr/src/obd/mds/mds.o
-insmod $R/usr/src/obd/mdc/mdc.o
-insmod $R/usr/src/obd/llight/llight.o
-
 tmp_fs ext2 /tmp/ost 10000
 OST=${LOOPDEV}
 
-mknod /dev/obd c 10 241
-
 $OBDCTL <<EOF
 device 1
 attach obdext2

diff --git a/lustre/tests/llmount-server.sh b/lustre/tests/llmount-server.sh
index b9ac8ae..bf3add7 100644 (file)
--- a/lustre/tests/llmount-server.sh
+++ b/lustre/tests/llmount-server.sh
@@ -5,35 +5,27 @@ export PATH=/sbin:/usr/sbin:$PATH
 SRCDIR="`dirname $0`"
 . $SRCDIR/common.sh
 
-mknod /dev/portals c 10 240
+NETWORK=elan
+LOCALHOST=5
+SERVER=5
 
-insmod $R/usr/src/portals/linux/oslib/portals.o
-# insmod $R/usr/src/portals/linux/socknal/ksocknal.o
-insmod $R/usr/src/portals/linux/qswnal/kqswnal.o
-
-# $R/usr/src/portals/linux/utils/acceptor 1234 &
+setup
 
 $PTLCTL <<EOF
-mynid
-setup elan
-connect 5
+setup $NETWORK
+mynid $LOCALHOST
+connect $LOCALHOST
 add_uuid self
+add_uuid mds
+add_uuid ost
 EOF
 
-insmod $R/usr/src/obd/rpc/ptlrpc.o
-insmod $R/usr/src/obd/class/obdclass.o 
-insmod $R/usr/src/obd/ext2obd/obdext2.o
-insmod $R/usr/src/obd/ost/ost.o
-insmod $R/usr/src/obd/mds/mds.o
-
 tmp_fs ext2 /tmp/ost 10000
 OST=${LOOPDEV}
 MDSFS=ext2
 tmp_fs ${MDSFS} /tmp/mds 10000
 MDS=${LOOPDEV}
 
-mknod /dev/obd c 10 241
-
 $OBDCTL <<EOF
 device 0
 attach mds

diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh
index 6efb808..ad2a87f 100755 (executable)
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -3,11 +3,13 @@
 SRCDIR="`dirname $0`"
 . $SRCDIR/common.sh
 
+NETWORK=tcp
+
 setup
 
 $PTLCTL <<EOF
+setup $NETWORK
 mynid localhost
-setup tcp
 connect localhost 1234
 add_uuid self
 add_uuid mds