Added support to specify the lustre obj dir.

diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh
index 1e2bd6a..bc2a5e7 100755 (executable)
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -11,8 +11,12 @@ if [ "$PORTALS" ]; then
   portals_opt="--portals=$PORTALS"
 fi
 
+if [ "$LUSTRE" ]; then
+  lustre_opt="--lustre=$LUSTRE"
+fi
+
 [ -x $LCONF ] || chmod a+rx $LCONF
 
 sh $mkconfig $config || exit 1
 
-${LCONF} $portals_opt --reformat --gdb $config || exit 2
+${LCONF} $portals_opt $lustre_opt --reformat --gdb $config || exit 2

diff --git a/lustre/tests/llmountcleanup.sh b/lustre/tests/llmountcleanup.sh
index 8d4fa52..cd28d21 100755 (executable)
--- a/lustre/tests/llmountcleanup.sh
+++ b/lustre/tests/llmountcleanup.sh
@@ -11,12 +11,16 @@ if [ "$PORTALS" ]; then
   portals_opt="--portals=$PORTALS"
 fi
 
+if [ "$LUSTRE" ]; then
+  lustre_opt="--lustre=$LUSTRE"
+fi
+
 if [ ! -f $config ]; then
    sh $mkconfig $config || exit 1
 fi
 
 sync; sleep 2; sync
-${LCONF} $portals_opt --cleanup --dump $TMP/debug $config
+${LCONF} $portals_opt $lustre_opt --cleanup --dump $TMP/debug $config
 rc=$?
 BUSY=`dmesg | grep -i destruct`
 if [ "$BUSY" ]; then

diff --git a/lustre/tests/llrmount.sh b/lustre/tests/llrmount.sh
index 9bf287e..6531055 100755 (executable)
--- a/lustre/tests/llrmount.sh
+++ b/lustre/tests/llrmount.sh
@@ -10,8 +10,12 @@ if [ "$PORTALS" ]; then
   portals_opt="--portals=$PORTALS"
 fi
 
+if [ "$LUSTRE" ]; then
+  lustre_opt="--lustre=$LUSTRE"
+fi
+
 if [ ! -f $config -o $mkconfig -nt $config ]; then
    sh $mkconfig $config || exit 1
 fi
 
-${LCONF} $portals_opt --gdb $config || exit 2
+${LCONF} $portals_opt $lustre_opt --gdb $config || exit 2