land b_md onto HEAD:

[fs/lustre-release.git] / lustre / tests / llsetup.sh

diff --git a/lustre/tests/llsetup.sh b/lustre/tests/llsetup.sh
index 0b1fc4a..4828f26 100644 (file)
--- a/lustre/tests/llsetup.sh
+++ b/lustre/tests/llsetup.sh
@@ -1,12 +1,15 @@
-#!/bin/sh
+#!/bin/sh -vx
+
+SRCDIR="`dirname $0`/"
+[ -f $SRCDIR/common.sh ] || SRCDIR="/lib/lustre"
 
-SRCDIR="`dirname $0`"
 . $SRCDIR/common.sh
 
 setup_opts "$@"
 
-setup_portals
-setup_lustre
+setup_portals || exit $?
+setup_lustre || exit $?
+setup_ldlm || exit $?
 
-setup_server new_fs
-setup_client
+setup_server new_fs || exit $?
+setup_client || exit $?