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

diff --git a/lustre/tests/run-llog.sh b/lustre/tests/run-llog.sh
index 64d6403..aa41fa1 100644
--- a/lustre/tests/run-llog.sh
+++ b/lustre/tests/run-llog.sh
@@ -1,16 +1,47 @@
 #!/bin/bash
-insmod ../obdclass/llog_test.o
-../utils/lctl modules > /r/tmp/ogdb-localhost.localdomain
+
+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}
+
+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.."
 
-# Using ignore_errors will allow lctl to cleanup even if the test
-# fails.
-../utils/lctl <<EOF
-ignore_errors
-newdev
+RC=0
+lctl <<EOT || RC=2
 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
+device llt_name
+ignore_errors
 cleanup
 detach
-EOF
-rmmod llog_test
+EOC
+rmmod llog_test || RC2=3
+[ $RC -eq 0 -a "$RC2" ] && RC=$RC2
+
+exit $RC