X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Frun-llog.sh;h=937daee14867fed77f6ef65585c45174db09f0c6;hp=be3449c3a9b09adae629c41e165095b66409be97;hb=9c4156e6fc146a198bb342e28eb246f1076889bd;hpb=611b0a8109207b837dde6598fbb7f4d1cc7adb91

diff --git a/lustre/tests/run-llog.sh b/lustre/tests/run-llog.sh
index be3449c..937daee 100644
--- a/lustre/tests/run-llog.sh
+++ b/lustre/tests/run-llog.sh
@@ -1,33 +1,45 @@
 #!/bin/bash
-PATH=`dirname $0`:`dirname $0`/../utils:$PATH
-TMP=${TMP:-/tmp}
 
-MDS=`find /proc/fs/lustre/mds/* -type d | head -n1 | sed 's/.*\///'`
-[ -z "$MDS" ] && echo "no MDS available, skipping llog test" && exit 0
+LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+. $LUSTRE/tests/test-framework.sh
+init_test_env $@
+. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
+
+load_llog_test() {
+    grep -q llog_test /proc/modules && return
+    # Module should have been placed with other lustre modules...
+    modprobe llog_test 2>&1 | grep -v "llog_test not found"
+    grep -q llog_test /proc/modules && return
+    # But maybe we're running from a developer tree...
+    insmod $LUSTRE/obdclass/llog_test.ko
+    grep -q llog_test /proc/modules && return
+    echo "Unable to load llog_test module!"
+    false
+    return
+}
 
-insmod ../obdclass/llog_test.o || exit 1
-lctl modules > $TMP/ogdb-`hostname`
+PATH=$(dirname $0):$LUSTRE/utils:$PATH
+TMP=${TMP:-/tmp}
 
-# take care of UML developers
-[ -f /r/$TMP/ogdb-`hostname` ] && 
-    cp -f $TMP/ogdb-`hostname` /r/$TMP/ogdb-`hostname`
+set -x
+MGS=$($LCTL dl | awk '/mgs/ { print $4 }')
+[ -z "$MGS" ] && echo "$0: SKIP: no MGS available, skipping llog test" && exit 0
+
+load_llog_test || exit 0
+$LCTL modules > $TMP/ogdb-$(hostname)
 echo "NOW reload debugging syms.."
 
 RC=0
-lctl <<EOT || RC=2
-newdev
-attach llog_test llt_name llt_uuid
-setup $MDS
-EOT
-
 # Using ignore_errors will allow lctl to cleanup even if the test fails.
-lctl <<EOC
-cfg_device llt_name
-ignore_errors
-cleanup
-detach
-EOC
-rmmod llog_test || RC2=3
+eval "$LCTL <<-EOF || RC=2
+	attach llog_test llt_name llt_uuid
+	setup $MGS
+	device llt_name
+	ignore_errors
+	cleanup
+	detach
+EOF"
+rmmod -v llog_test || RC2=3
 [ $RC -eq 0 -a "$RC2" ] && RC=$RC2
 
 exit $RC