From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrew Price <anprice@redhat.com>
Date: Wed, 14 Jan 2015 16:16:17 +0000
Subject: [Cluster-devel] [PATCH 1/5] gfs2-utils tests: Add keywords to tests
Message-ID: <1421252181-20776-1-git-send-email-anprice@redhat.com>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

The testsuite script generated by autotest accepts a -k <keyword> option
which limits the set of tests to be run to a specified group. Add
keywords to tests to take advantage of this feature.

Signed-off-by: Andrew Price <anprice@redhat.com>
---
 tests/edit.at    |  5 +++++
 tests/fsck.at    |  2 ++
 tests/libgfs2.at |  2 ++
 tests/mkfs.at    | 16 ++++++++++++++++
 4 files changed, 25 insertions(+)

diff --git a/tests/edit.at b/tests/edit.at
index 49f4a58..e3f02e6 100644
--- a/tests/edit.at
+++ b/tests/edit.at
@@ -2,6 +2,7 @@ AT_TESTED([gfs2_edit])
 AT_BANNER([gfs2_edit tests])
 
 AT_SETUP([Save/restoremeta, defaults])
+AT_KEYWORDS(gfs2_edit edit)
 GFS_TGT_REGEN
 AT_CHECK([$GFS_MKFS -p lock_nolock $GFS_TGT $(($(gfs_max_blocks 4096)/2))], 0, [ignore], [ignore])
 AT_CHECK([gfs2_edit savemeta $GFS_TGT test.meta > savemeta.log], 0, [ignore], [ignore])
@@ -14,6 +15,7 @@ AT_CHECK([fsck.gfs2 -n $GFS_TGT], 0, [ignore], [ignore])
 AT_CLEANUP
 
 AT_SETUP([Save/restoremeta, no compression])
+AT_KEYWORDS(gfs2_edit edit)
 GFS_TGT_REGEN
 AT_CHECK([$GFS_MKFS -p lock_nolock $GFS_TGT $(($(gfs_max_blocks 4096)/2))], 0, [ignore], [ignore])
 AT_CHECK([gfs2_edit savemeta -z0 $GFS_TGT test.meta], 0, [ignore], [ignore])
@@ -23,6 +25,7 @@ AT_CHECK([fsck.gfs2 -n $GFS_TGT], 0, [ignore], [ignore])
 AT_CLEANUP
 
 AT_SETUP([Save/restoremeta, min. block size])
+AT_KEYWORDS(gfs2_edit edit)
 GFS_TGT_REGEN
 AT_CHECK([$GFS_MKFS -p lock_nolock -b512 $GFS_TGT], 0, [ignore], [ignore])
 AT_CHECK([gfs2_edit savemeta -z0 $GFS_TGT test.meta], 0, [ignore], [ignore])
@@ -32,6 +35,7 @@ AT_CHECK([fsck.gfs2 -n $GFS_TGT], 0, [ignore], [ignore])
 AT_CLEANUP
 
 AT_SETUP([Save/restoremeta, 4 journals])
+AT_KEYWORDS(gfs2_edit edit)
 GFS_TGT_REGEN
 AT_CHECK([$GFS_MKFS -p lock_nolock -j4 -J8 $GFS_TGT], 0, [ignore], [ignore])
 AT_CHECK([gfs2_edit savemeta -z0 $GFS_TGT test.meta], 0, [ignore], [ignore])
@@ -41,6 +45,7 @@ AT_CHECK([fsck.gfs2 -n $GFS_TGT], 0, [ignore], [ignore])
 AT_CLEANUP
 
 AT_SETUP([Save/restoremeta, min. block size, 4 journals])
+AT_KEYWORDS(gfs2_edit edit)
 GFS_TGT_REGEN
 AT_CHECK([$GFS_MKFS -p lock_nolock -b512 -j4 -J8 $GFS_TGT], 0, [ignore], [ignore])
 AT_CHECK([gfs2_edit savemeta -z0 $GFS_TGT test.meta], 0, [ignore], [ignore])
diff --git a/tests/fsck.at b/tests/fsck.at
index afe26db..65dc521 100644
--- a/tests/fsck.at
+++ b/tests/fsck.at
@@ -2,6 +2,7 @@ AT_TESTED([fsck.gfs2])
 AT_BANNER([fsck.gfs2 tests])
 
 AT_SETUP([Fix invalid block sizes])
+AT_KEYWORDS(fsck.gfs2 fsck)
 GFS_LANG_CHECK([mkfs.gfs2 -O -p lock_nolock $GFS_TGT], [set sb { sb_bsize: 0 }])
 GFS_LANG_CHECK([mkfs.gfs2 -O -p lock_nolock $GFS_TGT], [set sb { sb_bsize: 1 }])
 GFS_LANG_CHECK([mkfs.gfs2 -O -p lock_nolock $GFS_TGT], [set sb { sb_bsize: 513 }])
@@ -10,6 +11,7 @@ GFS_LANG_CHECK([mkfs.gfs2 -O -p lock_nolock $GFS_TGT], [set sb { sb_bsize: 4097
 AT_CLEANUP
 
 AT_SETUP([Fix invalid goal blocks])
+AT_KEYWORDS(fsck.gfs2 fsck)
 GFS_LANG_CHECK([mkfs.gfs2 -O -p lock_nolock $GFS_TGT], [set '/' { di_goal_meta: 0 }])
 GFS_LANG_CHECK([mkfs.gfs2 -O -p lock_nolock $GFS_TGT], [set '/' { di_goal_data: 0 }])
 AT_CLEANUP
diff --git a/tests/libgfs2.at b/tests/libgfs2.at
index 8c44cdd..a5bee87 100644
--- a/tests/libgfs2.at
+++ b/tests/libgfs2.at
@@ -1,9 +1,11 @@
 AT_BANNER([libgfs2 unit tests])
 
 AT_SETUP([meta.c])
+AT_KEYWORDS(libgfs2)
 AT_CHECK([check_meta], 0, [ignore], [ignore])
 AT_CLEANUP
 
 AT_SETUP([rgrp.c])
+AT_KEYWORDS(libgfs2)
 AT_CHECK([check_rgrp], 0, [ignore], [ignore])
 AT_CLEANUP
diff --git a/tests/mkfs.at b/tests/mkfs.at
index ff99bb1..438184c 100644
--- a/tests/mkfs.at
+++ b/tests/mkfs.at
@@ -2,36 +2,43 @@ AT_TESTED([mkfs.gfs2])
 AT_BANNER([mkfs.gfs2 tests])
 
 AT_SETUP([Locking protocol validation])
+AT_KEYWORDS(mkfs.gfs2 mkfs)
 AT_CHECK([$GFS_MKFS -p badprotocol $GFS_TGT], 255, [ignore], [ignore])
 AT_CLEANUP
 
 AT_SETUP([Resource group size validation])
+AT_KEYWORDS(mkfs.gfs2 mkfs)
 AT_CHECK([$GFS_MKFS -p lock_nolock -r 31 $GFS_TGT], 255, [ignore], [ignore])
 AT_CHECK([$GFS_MKFS -p lock_nolock -r 2049 $GFS_TGT], 255, [ignore], [ignore])
 AT_CLEANUP
 
 AT_SETUP([Journal size validation])
+AT_KEYWORDS(mkfs.gfs2 mkfs)
 AT_CHECK([$GFS_MKFS -p lock_nolock -J 7 $GFS_TGT], 255, [ignore], [ignore])
 AT_CHECK([$GFS_MKFS -p lock_nolock -J 1025 $GFS_TGT], 255, [ignore], [ignore])
 AT_CLEANUP
 
 AT_SETUP([Block count validation])
+AT_KEYWORDS(mkfs.gfs2 mkfs)
 GFS_TGT_REGEN
 AT_CHECK([$GFS_MKFS -p lock_nolock -b 512 $GFS_TGT $(($(gfs_max_blocks 512)+1))], 255, [ignore], [ignore])
 AT_CHECK([$GFS_MKFS -p lock_nolock -b 4096 $GFS_TGT $(($(gfs_max_blocks 4096)+1))], 255, [ignore], [ignore])
 AT_CLEANUP
 
 AT_SETUP([Quota change file size validation])
+AT_KEYWORDS(mkfs.gfs2 mkfs)
 AT_CHECK([$GFS_MKFS -p lock_nolock -c 0 $GFS_TGT], 255, [ignore], [ignore])
 AT_CHECK([$GFS_MKFS -p lock_nolock -c 65 $GFS_TGT], 255, [ignore], [ignore])
 AT_CLEANUP
 
 AT_SETUP([Locking protocols])
+AT_KEYWORDS(mkfs.gfs2 mkfs)
 GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock $GFS_TGT])
 GFS_FSCK_CHECK([$GFS_MKFS -p lock_dlm -t foo:bar $GFS_TGT])
 AT_CLEANUP
 
 AT_SETUP([Valid block sizes 512-4096])
+AT_KEYWORDS(mkfs.gfs2 mkfs)
 GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -b 512 $GFS_TGT])
 GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -b 1024 $GFS_TGT])
 GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -b 2048 $GFS_TGT])
@@ -39,37 +46,46 @@ GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -b 4096 $GFS_TGT])
 AT_CLEANUP
 
 AT_SETUP([Max. blocks, min. block size])
+AT_KEYWORDS(mkfs.gfs2 mkfs)
 GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -b 512 $GFS_TGT $(gfs_max_blocks 512)])
 AT_CLEANUP
 
 AT_SETUP([Max. blocks, max. block size])
+AT_KEYWORDS(mkfs.gfs2 mkfs)
 GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -b 4096 $GFS_TGT $(util_max_blocks 4096)])
 AT_CLEANUP
 
 AT_SETUP([Max. resource group size])
+AT_KEYWORDS(mkfs.gfs2 mkfs)
 GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -r 2048 $GFS_TGT])
 AT_CLEANUP
 
 AT_SETUP([Min. resource group size])
+AT_KEYWORDS(mkfs.gfs2 mkfs)
 GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -r 32 $GFS_TGT])
 AT_CLEANUP
 
 AT_SETUP([Max. resource group size, min. block size])
+AT_KEYWORDS(mkfs.gfs2 mkfs)
 GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -r 2048 -b 512 $GFS_TGT])
 AT_CLEANUP
 
 AT_SETUP([Max. journal size])
+AT_KEYWORDS(mkfs.gfs2 mkfs)
 GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -J 1024 $GFS_TGT])
 AT_CLEANUP
 
 AT_SETUP([Min. journal size])
+AT_KEYWORDS(mkfs.gfs2 mkfs)
 GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -J 8 $GFS_TGT])
 AT_CLEANUP
 
 AT_SETUP([Max. quota change file size])
+AT_KEYWORDS(mkfs.gfs2 mkfs)
 GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -c 64 $GFS_TGT])
 AT_CLEANUP
 
 AT_SETUP([Min. quota change file size])
+AT_KEYWORDS(mkfs.gfs2 mkfs)
 GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -c 1 $GFS_TGT])
 AT_CLEANUP
-- 
1.9.3