X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Frun-llog.sh;h=aa41fa116ae6967ecc20df324bd550fc556393bf;hb=0fda09a56aaf8105c7c5cb0326d0c8fcec6fc04c;hp=b7201f269427811e2403b6e7e4a99659278494b1;hpb=2dc9c16e770415d56839e1996015fec5fab93f29;p=fs%2Flustre-release.git

diff --git a/lustre/tests/run-llog.sh b/lustre/tests/run-llog.sh
index b7201f2..aa41fa1 100644
--- a/lustre/tests/run-llog.sh
+++ b/lustre/tests/run-llog.sh
@@ -1,24 +1,42 @@
 #!/bin/bash
-PATH=`dirname $0`:`dirname $0`/../utils:$PATH
+
+LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+
+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
+    # This is for 2.4 kernels (deprecated!)
+    insmod $LUSTRE/obdclass/llog_test.o
+    grep -q llog_test /proc/modules && return
+    echo "Unable to load llog_test module!"
+    false
+    return
+}
+
+PATH=`dirname $0`:$LUSTRE/utils:$PATH
 TMP=${TMP:-/tmp}
 
-MDS=`ls /proc/fs/lustre/mds | grep -v num_refs | head -n 1`
-[ -z "$MDS" ] && echo "no MDS available, skipping llog test" && exit 0
+MGS=`lctl dl | awk '/mgs/ { print $4 }'`
+[ -z "$MGS" ] && echo "$0: SKIP: no MGS available, skipping llog test" && exit 0
 
-insmod ../obdclass/llog_test.o || exit 1
+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
+setup $MGS
 EOT
 
 # Using ignore_errors will allow lctl to cleanup even if the test fails.
 lctl <<EOC
-cfg_device llt_name
+device llt_name
 ignore_errors
 cleanup
 detach