-PATH=`dirname $0`:`dirname $0`/../utils:$PATH
-insmod ../obdclass/llog_test.o || exit 1
-lctl modules > /r/tmp/ogdb-`hostname`
+
+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
+}
+
+PATH=$(dirname $0):$LUSTRE/utils:$PATH
+TMP=${TMP:-/tmp}
+
+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)