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

diff --git a/lustre/tests/run-llog.sh b/lustre/tests/run-llog.sh
index 6a4ffc1..aa41fa1 100644
--- a/lustre/tests/run-llog.sh
+++ b/lustre/tests/run-llog.sh
@@ -1,20 +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}
-insmod ../obdclass/llog_test.o || exit 1
+
+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 mds1
+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