Correctly detect if dmapi is present of not in tests 175-177

Merge of master-melb:xfs-cmds:31032a by kenmcd.

  Correctly detect if dmapi is present.

diff --git a/175 b/175
index 725436a8435e6c41a009b10744b7ca6a443e34da..e78b5829b67d7375d3ccb24bcbcd751572921092 100755 (executable)
--- a/175
+++ b/175
@@ -29,6 +29,7 @@ _cleanup()
 # get standard environment, filters and checks
 . ./common.rc
 . ./common.filter
+. ./common.dmapi
 . ./common.punch
 
 # real QA test starts here
@@ -37,6 +38,10 @@ _supported_os Linux
 
 _require_scratch
 
+# test that we have DMAPI support
+_dmapi_scratch_mount
+unmount $SCRATCH_MNT > /dev/null 2>&1
+
 # _test_punch args: blksize extsize_hint filesize "pp1 pp2 pp3" \
 #                                      "ps1 ps2 ps3" "pt1 pt2 pt3" "wp1 wp2" "ws1 ws2" \
 #                                      "w p p w p" resvsp

diff --git a/176 b/176
index e5255edbee42e8c84cbbcaaf803175b1cd576ae8..163fd368ef0b0ec8f14b654a0116f22fadbb2e34 100755 (executable)
--- a/176
+++ b/176
@@ -27,6 +27,7 @@ _cleanup()
 # get standard environment, filters and checks
 . ./common.rc
 . ./common.filter
+. ./common.dmapi
 . ./common.punch
 
 # real QA test starts here
@@ -35,6 +36,10 @@ _supported_os Linux
 
 _require_scratch
 
+# test that we have DMAPI support
+_dmapi_scratch_mount
+unmount $SCRATCH_MNT > /dev/null 2>&1
+
 # _test_punch args: blksize extsize_hint filesize "pp1 pp2 pp3" \
 #                                      "ps1 ps2 ps3" "pt1 pt2 pt3" "wp1 wp2" "ws1 ws2" \
 #                                      "w p p w p" resvsp

diff --git a/177 b/177
index ab334c07a439ec95c6a0db4dc14da4fa5788c4e0..5a4fafbc4df8ff7ad636113b230ce6d8a87723f6 100755 (executable)
--- a/177
+++ b/177
@@ -27,6 +27,7 @@ _cleanup()
 # get standard environment, filters and checks
 . ./common.rc
 . ./common.filter
+. ./common.dmapi
 
 # real QA test starts here
 
@@ -36,6 +37,11 @@ _supported_os Linux
 
 # Setup Filesystem
 _require_scratch
+
+# test that we have DMAPI support
+_dmapi_scratch_mount
+unmount $SCRATCH_MNT > /dev/null 2>&1
+
 _scratch_mkfs_xfs >/dev/null 2>&1 \
         || _fail "mkfs failed"