From 10433178c2e6b818cac9ada3542c6501ee0ae74f Mon Sep 17 00:00:00 2001 From: Allan Randall Date: Tue, 19 Dec 2006 05:09:57 +0000 Subject: [PATCH] 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 --- common.dmapi | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) 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 } -- 2.47.3