Change paths to use Lustre pathname instead of obd

diff --git a/lustre/tests/common.sh b/lustre/tests/common.sh
index 5cc7f06..964c9f8 100644 (file)
--- a/lustre/tests/common.sh
+++ b/lustre/tests/common.sh
@@ -4,7 +4,7 @@ export PATH=$PATH:/sbin:/usr/sbin
 [ -d /r ] && R=/r
 
 PORTALS=$SRCDIR../../portals
-LUSTRE=$SRCDIR../../obd
+LUSTRE=$SRCDIR../../lustre
 
 PTLCTL=$PORTALS/linux/utils/ptlctl
 DBGCTL=$PORTALS/linux/utils/debugctl
@@ -193,8 +193,8 @@ setup_portals() {
 setup_lustre() {
        [ -c /dev/obd ] || mknod /dev/obd c 10 241
 
-       do_insmod $LUSTRE/class/obdclass.o || exit -1
-       do_insmod $LUSTRE/rpc/ptlrpc.o || exit -1
+       do_insmod $LUSTRE/obdclass/obdclass.o || exit -1
+       do_insmod $LUSTRE/ptlrpc/ptlrpc.o || exit -1
        do_insmod $LUSTRE/ldlm/ldlm.o || exit -1
        do_insmod $LUSTRE/extN/extN.o || \
                echo "info: can't load extN.o module, not fatal if using ext3"
@@ -204,12 +204,12 @@ setup_lustre() {
        do_insmod $LUSTRE/mds/mds_extN.o || \
                echo "info: can't load mds_extN.o module, needs extN.o"
        do_insmod $LUSTRE/obdecho/obdecho.o || exit -1
-       do_insmod $LUSTRE/ext2obd/obdext2.o || exit -1
-       do_insmod $LUSTRE/filterobd/obdfilter.o || exit -1
+       do_insmod $LUSTRE/obdext2/obdext2.o || exit -1
+       do_insmod $LUSTRE/obdfilter/obdfilter.o || exit -1
        do_insmod $LUSTRE/ost/ost.o || exit -1
        do_insmod $LUSTRE/osc/osc.o || exit -1
        do_insmod $LUSTRE/mdc/mdc.o || exit -1
-       do_insmod $LUSTRE/llight/llite.o || exit -1
+       do_insmod $LUSTRE/llite/llite.o || exit -1
 
        list_mods
 

diff --git a/lustre/tests/fs.sh b/lustre/tests/fs.sh
index 736258f..b158c6e 100644 (file)
--- a/lustre/tests/fs.sh
+++ b/lustre/tests/fs.sh
@@ -12,16 +12,16 @@ dd if=/dev/zero of=/tmp/fs bs=1024 count=10000
 mke2fs -b 4096 -F /tmp/fs
 losetup /dev/loop/0 /tmp/fs
 
-insmod $R/usr/src/obd/class/obdclass.o 
-insmod $R/usr/src/obd/ext2obd/obdext2.o
+insmod $R/usr/src/lustre/obdclass/obdclass.o 
+insmod $R/usr/src/lustre/obdext2/obdext2.o
 mknod /dev/obd c 10 241
 
-$R/usr/src/obd/utils/obdctl <<EOF
+$R/usr/src/lustre/utils/obdctl <<EOF
 device 0
 attach obdext2 OBDEXT2DEV
 setup /dev/loop/0
 quit
 EOF
 
-insmod $R/usr/src/obd/obdfs/obdfs.o
+insmod $R/usr/src/lustre/obdfs/obdfs.o
 mount -t obdfs -o device=0 none /mnt

diff --git a/lustre/tests/rundbench b/lustre/tests/rundbench
index 0f6b66d..1b50536 100755 (executable)
--- a/lustre/tests/rundbench
+++ b/lustre/tests/rundbench
@@ -2,5 +2,5 @@
 
 [ -e /proc/sys/portals/debug ] && echo 0 > /proc/sys/portals/debug 
 cd /mnt/lustre
-cp /usr/src/obd/demos/dbench/client.txt .
-/usr/src/obd/demos/dbench/dbench $1
+cp /usr/src/lustre/demos/dbench/client.txt .
+/usr/src/lustre/demos/dbench/dbench $1