From: Allan Randall <allanr@sgi.com>
Date: Tue, 19 Dec 2006 05:09:57 +0000 (+0000)
Subject: check for dmapi module before running dmapi tests
X-Git-Tag: v1.1.0~546
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=10433178c2e6b818cac9ada3542c6501ee0ae74f;p=xfstests-dev.git

check for dmapi module before running dmapi tests
Merge of master-melb:xfs-cmds:27774a by kenmcd.

  check for dmapi module before running dmapi tests
---

diff --git a/common.dmapi b/common.dmapi
index df15da16..10409c30 100644
--- a/common.dmapi
+++ b/common.dmapi
@@ -13,11 +13,15 @@ DMAPI_QASUITE2_DIR=$here/dmapi/src/suite2/
 DMAPI_LS_TO_COPY_PATH=$DMAPI_QASUITE2_DIR/bindir/ls_to_copy
 
 _dmapi_scratch_mount () {
-    if [ `echo "$MOUNT_OPTIONS" | grep -c dmapi` -gt 0 -o \
-         `echo "$MOUNT_OPTIONS" | grep -c dmi` -gt 0 ] ; then
-        #already got dmapi options set
-        _scratch_mount
+    if [ `lsmod | grep -c dmapi` -gt 0 ] ; then
+        if [ `echo "$MOUNT_OPTIONS" | grep -c dmapi` -gt 0 -o \
+            `echo "$MOUNT_OPTIONS" | grep -c dmi` -gt 0 ] ; then
+            #already got dmapi options set
+            _scratch_mount
+        else
+            _scratch_mount "-o dmapi,mtpt=$SCRATCH_MNT"
+        fi
     else
-        _scratch_mount "-o dmapi,mtpt=$SCRATCH_MNT"
+        _notrun "DMAPI modules not loaded"
     fi
 }