From: adilger <adilger>
Date: Tue, 9 Apr 2002 21:59:27 +0000 (+0000)
Subject: Start to abstract out the location of modules for LUSTRE and PORTALS.  It
X-Git-Tag: v1_7_100~5782
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=8f8cbc2bfd169c1267ca350a1cdaf0ea9dcc8a1c;p=fs%2Flustre-release.git

Start to abstract out the location of modules for LUSTRE and PORTALS.  It
doesn't actually do anything differently yet, but at least we have isolated
the paths into a single location.
---

diff --git a/lustre/tests/common.sh b/lustre/tests/common.sh
index d0f835c..9c398a1 100644
--- a/lustre/tests/common.sh
+++ b/lustre/tests/common.sh
@@ -4,10 +4,14 @@ if [ -d /r ]; then
 	R=/r
 fi
 
-PTLCTL=$SRCDIR/../../portals/linux/utils/ptlctl
-OBDCTL=$SRCDIR/../../obd/utils/obdctl
-DEBCTL=$SRCDIR/../../portals/linux/utils/debugctl
-ACCEPTOR=$SRCDIR/../../portals/linux/utils/acceptor
+PORTALS=$SRCDIR/../../portals
+LUSTRE=$SRCDIR/../../obd
+
+PTLCTL=$PORTALS/linux/utils/ptlctl
+DEBCTL=$PORTALS/linux/utils/debugctl
+ACCEPTOR=$PORTALS/linux/utils/acceptor
+
+OBDCTL=$LUSTRE/utils/obdctl
 
 LOOPNUM=0; export LOOPNUM
 if [ -b /dev/loop0 ]; then
@@ -102,20 +106,20 @@ setup_portals() {
 
 	[ -c /dev/portals ] || mknod /dev/portals c 10 240
 
-	insmod $SRCDIR/../../portals/linux/oslib/portals.o || exit -1
+	insmod $PORTALS/linux/oslib/portals.o || exit -1
 
 	case $NETWORK in
 	elan)	if [ "$PORT" ]; then
 			echo "$0: NETWORK is elan but PORT is set" 1>&2
 			exit -1
 		fi
-		insmod $SRCDIR/../../portals/linux/qswnal/kqswnal.o
+		insmod $PORTALS/linux/qswnal/kqswnal.o
 		;;
 	tcp)	if [ -z "$PORT" ]; then
 			echo "$0: NETWORK is tcp but PORT is not set" 1>&2
 			exit -1
 		fi
-		insmod $SRCDIR/../../portals/linux/socknal/ksocknal.o || exit -1
+		insmod $PORTALS/linux/socknal/ksocknal.o || exit -1
 		$ACCEPTOR $PORT
 		;;
 	*) 	echo "$0: unknown NETWORK \'$NETWORK\'" 1>&2
@@ -137,17 +141,17 @@ setup_portals() {
 setup_lustre() {
 	[ -c /dev/obd ] || mknod /dev/obd c 10 241
 
-	insmod $SRCDIR/../../obd/class/obdclass.o || exit -1
-	insmod $SRCDIR/../../obd/rpc/ptlrpc.o || exit -1
-	insmod $SRCDIR/../../obd/ldlm/ldlm.o || exit -1
-	insmod $SRCDIR/../../obd/ext2obd/obdext2.o || exit -1
-	insmod $SRCDIR/../../obd/filterobd/obdfilter.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/llite.o || exit -1
+	insmod $LUSTRE/class/obdclass.o || exit -1
+	insmod $LUSTRE/rpc/ptlrpc.o || exit -1
+	insmod $LUSTRE/ldlm/ldlm.o || exit -1
+	insmod $LUSTRE/ext2obd/obdext2.o || exit -1
+	insmod $LUSTRE/filterobd/obdfilter.o || exit -1
+	insmod $LUSTRE/ost/ost.o || exit -1
+	insmod $LUSTRE/osc/osc.o || exit -1
+	insmod $LUSTRE/obdecho/obdecho.o || exit -1
+	insmod $LUSTRE/mds/mds.o || exit -1
+	insmod $LUSTRE/mdc/mdc.o || exit -1
+	insmod $LUSTRE/llight/llite.o || exit -1
 
 	list_mods
 
@@ -157,10 +161,10 @@ setup_lustre() {
 setup_ldlm() {
 	[ -c /dev/portals ] || mknod /dev/portals c 10 240
 
-	insmod $SRCDIR/../../portals/linux/oslib/portals.o || exit -1
+	insmod $PORTALS/linux/oslib/portals.o || exit -1
 
-	insmod $SRCDIR/../../obd/class/obdclass.o || exit -1
-	insmod $SRCDIR/../../obd/ldlm/ldlm.o || exit -1
+	insmod $LUSTRE/class/obdclass.o || exit -1
+	insmod $LUSTRE/ldlm/ldlm.o || exit -1
 
 	list_mods
 }