[2/2] tasks-upstream: add xfs rmapbt and reflink tests to xfs regression and ltp tests

Commit Message

Eryu Guan May 4, 2017, 9:52 a.m. UTC

Signed-off-by: Eryu Guan <[e-mail]>
---
 tasks-upstream/function-ltp-aiodio.task | 16 ++++++++++++++++
 tasks-upstream/function-ltp.task        | 26 ++++++++++++++++++++++++--
 tasks-upstream/regression-xfs.task      | 18 ++++++++++++++++++
 3 files changed, 58 insertions(+), 2 deletions(-)

Patch

diff --git a/tasks-upstream/function-ltp-aiodio.task b/tasks-upstream/function-ltp-aiodio.task
index 6bbadf8..644b8e8 100644
--- a/tasks-upstream/function-ltp-aiodio.task
+++ b/tasks-upstream/function-ltp-aiodio.task
@@ -41,6 +41,22 @@  param=MKFS_OPTS=-m crc=1
 distro=-el6
 arch=all
 
+[xfs-rmap]
+desc=ltp-aiodio tests on xfs with rmapbt enabled
+tag=tier2 xfs
+param=FSTYP=xfs
+param=MKFS_OPTS=-m rmap=1
+distro=-el6
+arch=all
+
+[xfs-reflink]
+desc=ltp-aiodio tests on xfs with reflink enabled
+tag=tier2 xfs
+param=FSTYP=xfs
+param=MKFS_OPTS=-m reflink=1
+distro=-el6
+arch=all
+
 [xfs-sparse]
 desc=ltp-aiodio tests on xfs with crc and sparse enabled
 tag=tier3 xfs
diff --git a/tasks-upstream/function-ltp.task b/tasks-upstream/function-ltp.task
index 9a92801..e477860 100644
--- a/tasks-upstream/function-ltp.task
+++ b/tasks-upstream/function-ltp.task
@@ -48,6 +48,30 @@  distro=-el6
 partition=fs="xfs" name="/mnt/ltp" size="5" type="part"
 arch=all
 
+[xfs-rmap]
+desc=ltp tests on xfs with rmapbt enabled
+tag=tier2 xfs
+param=FSTYP=xfs
+# TEST_MNT should not be /mnt/testarea, unable to umount /mnt/testarea since beaker
+# is using it. So let's grab the test device mounted on /mnt/ltp then mount it on
+# /mnt/testarea
+param=TEST_MNT=/mnt/ltp
+param=MKFS_OPTS=-m rmap=1
+partition=fs="xfs" name="/mnt/ltp" size="5" type="part"
+arch=all
+
+[xfs-reflink]
+desc=ltp tests on xfs with reflink enabled
+tag=tier2 xfs
+param=FSTYP=xfs
+# TEST_MNT should not be /mnt/testarea, unable to umount /mnt/testarea since beaker
+# is using it. So let's grab the test device mounted on /mnt/ltp then mount it on
+# /mnt/testarea
+param=TEST_MNT=/mnt/ltp
+param=MKFS_OPTS=-m reflink=1
+partition=fs="xfs" name="/mnt/ltp" size="5" type="part"
+arch=all
+
 [xfs-sparse]
 desc=ltp tests on xfs with crc and sparse enabled
 tag=tier3 xfs
@@ -57,8 +81,6 @@  param=FSTYP=xfs
 # /mnt/testarea
 param=TEST_MNT=/mnt/ltp
 param=MKFS_OPTS=-m crc=1 -i sparse=1
-# only RHEL7 supports v5 xfs
-distro=-el6
 partition=fs="xfs" name="/mnt/ltp" size="5" type="part"
 arch=all
 
diff --git a/tasks-upstream/regression-xfs.task b/tasks-upstream/regression-xfs.task
index b017177..32758c2 100644
--- a/tasks-upstream/regression-xfs.task
+++ b/tasks-upstream/regression-xfs.task
@@ -18,6 +18,24 @@  task=/kernel/filesystems/xfs/regression
 arch=all
 param=MKFS_OPTS=-m crc=1
 
+[xfs-regression-rmap]
+type=regression
+schedule=alone
+tag=tier2 xfs
+desc=xfs regression tests with rmap enabled
+task=/kernel/filesystems/xfs/regression
+arch=all
+param=MKFS_OPTS=-m rmap=1
+
+[xfs-regression-reflink]
+type=regression
+schedule=alone
+tag=tier2 xfs
+desc=xfs regression tests with reflink enabled
+task=/kernel/filesystems/xfs/regression
+arch=all
+param=MKFS_OPTS=-m reflink=1
+
 [xfs-regression-sparse]
 type=regression
 schedule=alone