From bc53e6b75dd98445d583052967db3f1a1cabdff9 Mon Sep 17 00:00:00 2001 From: Dave Chinner Date: Thu, 8 May 2008 04:11:07 +0000 Subject: [PATCH] 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. --- 175 | 5 +++++ 176 | 5 +++++ 177 | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/175 b/175 index 725436a8..e78b5829 100755 --- 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 e5255edb..163fd368 100755 --- 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 ab334c07..5a4fafbc 100755 --- 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" -- 2.39.5