use relative paths to insert the modules relative to the test script

diff --git a/lustre/tests/common.sh b/lustre/tests/common.sh
index c99b774..35b9a0a 100644 (file)
--- a/lustre/tests/common.sh
+++ b/lustre/tests/common.sh
@@ -5,10 +5,10 @@ if [ -d /r ]; then
   R=/r
 fi
 
-PTLCTL=$R/usr/src/portals/linux/utils/ptlctl
-OBDCTL=$R/usr/src/obd/utils/obdctl
-DEBCTL=$R/usr/src/portals/linux/utils/debugctl
-ACCEPTOR=$R/usr/src/portals/linux/utils/acceptor
+PTLCTL=$SRCDIR/../../portals/linux/utils/ptlctl
+OBDCTL=$SRCDIR/../../obd/utils/obdctl
+DEBCTL=$SRCDIR/../../portals/linux/utils/debugctl
+ACCEPTOR=$SRCDIR/../../portals/linux/utils/acceptor
 
 LOOPNUM=0; export LOOPNUM
 if [ -b /dev/loop0 ]; then
@@ -54,23 +54,23 @@ old_fs () {
 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
+    insmod $SRCDIR/../../portals/linux/oslib/portals.o || exit -1
+    insmod $SRCDIR/../../portals/linux/qswnal/kqswnal.o
+    insmod $SRCDIR/../../portals/linux/socknal/ksocknal.o || exit -1
 
     $ACCEPTOR 1234 &
 
     [ -c /dev/obd ] || mknod /dev/obd c 10 241
 
-    insmod $R/usr/src/obd/class/obdclass.o || exit -1
-    insmod $R/usr/src/obd/rpc/ptlrpc.o || exit -1
-    insmod $R/usr/src/obd/ext2obd/obdext2.o || exit -1
-    insmod $R/usr/src/obd/ost/ost.o || exit -1
-    insmod $R/usr/src/obd/osc/osc.o || exit -1
-    insmod $R/usr/src/obd/obdecho/obdecho.o || exit -1
-    insmod $R/usr/src/obd/mds/mds.o || exit -1
-    insmod $R/usr/src/obd/mdc/mdc.o || exit -1
-    insmod $R/usr/src/obd/llight/llight.o || exit -1
+    insmod $SRCDIR/../../obd/class/obdclass.o || exit -1
+    insmod $SRCDIR/../../obd/rpc/ptlrpc.o || exit -1
+    insmod $SRCDIR/../../obd/ext2obd/obdext2.o || exit -1
+    insmod $SRCDIR/../../obd/ost/ost.o || exit -1
+    insmod $SRCDIR/../../obd/osc/osc.o || exit -1
+    insmod $SRCDIR/../../obd/obdecho/obdecho.o || exit -1
+    insmod $SRCDIR/../../obd/mds/mds.o || exit -1
+    insmod $SRCDIR/../../obd/mdc/mdc.o || exit -1
+    insmod $SRCDIR/../../obd/llight/llight.o || exit -1
 
     list_mods
 
@@ -80,10 +80,10 @@ setup() {
 setup_ldlm() {
     [ -c /dev/portals ] || mknod /dev/portals c 10 240
 
-    insmod $R/usr/src/portals/linux/oslib/portals.o || exit -1
+    insmod $SRCDIR/../../portals/linux/oslib/portals.o || exit -1
 
-    insmod $R/usr/src/obd/class/obdclass.o || exit -1
-    insmod $R/usr/src/obd/ldlm/ldlm.o || exit -1
+    insmod $SRCDIR/../../obd/class/obdclass.o || exit -1
+    insmod $SRCDIR/../../obd/ldlm/ldlm.o || exit -1
 
     list_mods
 }