From: brian <brian>
Date: Sat, 17 Jun 2006 22:05:32 +0000 (+0000)
Subject: Need to remember that these tests are not just done "in-tree", they are also
X-Git-Tag: v1_7_100~1^90~8^2~103
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=6ca386f2e540b568f21de1e031d23e14481452b9;p=fs%2Flustre-release.git

Need to remember that these tests are not just done "in-tree", they are also
done on properly installed (make install, rpm, etc.) lustre so...
When trying to install a modules, test if the module is in-tree and if not,
try to modprobe it.
---

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 81f7fb0..4982979 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -71,7 +71,13 @@ load_module() {
     module=$1
     shift
     BASE=`basename $module $EXT`
-    lsmod | grep ${BASE} > /dev/null || insmod ${LUSTRE}/${module}${EXT} $@
+    lsmod | grep -q ${BASE} || \
+      if [ -f ${LUSTRE}/${module}${EXT} ]; then
+        insmod ${LUSTRE}/${module}${EXT} $@
+    else
+        # must be testing a "make install" or "rpm" installation
+        modprobe $module $@
+    fi
 }
 
 load_modules() {