Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=f1fe60d8d2f... Commit: f1fe60d8d2fca0eb10d5cec6ecf8dacac3cb262e Parent: df42f67e822a19d4158735d2254be64131830da8 Author: Andrew Price anprice@redhat.com AuthorDate: Wed Jan 22 18:46:53 2014 +0000 Committer: Andrew Price anprice@redhat.com CommitterDate: Mon Jan 27 11:46:14 2014 +0000
mkfs.gfs2 tests: Enable debug output
Enable debug output of mkfs.gfs2 tests and define the base options as a shell variable to make them easier to maintain.
Signed-off-by: Andrew Price anprice@redhat.com --- tests/atlocal.in | 1 + tests/mkfs.at | 46 +++++++++++++++++++++++----------------------- 2 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/tests/atlocal.in b/tests/atlocal.in index 660c87a..b021b13 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -1,5 +1,6 @@ GFS_TGT="$abs_builddir/testvol" GFS_TGT_SZ=10 +GFS_MKFS="mkfs.gfs2 -O -D"
gfs_max_blocks() { diff --git a/tests/mkfs.at b/tests/mkfs.at index a3973af..2616109 100644 --- a/tests/mkfs.at +++ b/tests/mkfs.at @@ -2,70 +2,70 @@ AT_TESTED([mkfs.gfs2]) AT_BANNER([mkfs.gfs2 tests])
AT_SETUP([Locking protocol validation]) -AT_CHECK([mkfs.gfs2 -O -p badprotocol $GFS_TGT], 255, [ignore], [ignore]) +AT_CHECK([$GFS_MKFS -p badprotocol $GFS_TGT], 255, [ignore], [ignore]) AT_CLEANUP
AT_SETUP([Resource group size validation]) -AT_CHECK([mkfs.gfs2 -O -p lock_nolock -r 31 $GFS_TGT], 255, [ignore], [ignore]) -AT_CHECK([mkfs.gfs2 -O -p lock_nolock -r 2049 $GFS_TGT], 255, [ignore], [ignore]) +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_CHECK([mkfs.gfs2 -O -p lock_nolock -J 7 $GFS_TGT], 255, [ignore], [ignore]) -AT_CHECK([mkfs.gfs2 -O -p lock_nolock -J 1025 $GFS_TGT], 255, [ignore], [ignore]) +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]) GFS_TGT_REGEN -AT_CHECK([mkfs.gfs2 -O -p lock_nolock -b 512 $GFS_TGT $(($(gfs_max_blocks 512)+1))], 255, [ignore], [ignore]) -AT_CHECK([mkfs.gfs2 -O -p lock_nolock -b 4096 $GFS_TGT $(($(gfs_max_blocks 4096)+1))], 255, [ignore], [ignore]) +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_CHECK([mkfs.gfs2 -O -p lock_nolock -c 0 $GFS_TGT], 255, [ignore], [ignore]) -AT_CHECK([mkfs.gfs2 -O -p lock_nolock -c 65 $GFS_TGT], 255, [ignore], [ignore]) +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]) -GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock $GFS_TGT]) -GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_dlm -t foo:bar $GFS_TGT]) +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]) -GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -b 512 $GFS_TGT]) -GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -b 1024 $GFS_TGT]) -GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -b 2048 $GFS_TGT]) -GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -b 4096 $GFS_TGT]) +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]) +GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -b 4096 $GFS_TGT]) AT_CLEANUP
AT_SETUP([Max. blocks, min. block size]) -GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -b 512 $GFS_TGT $(gfs_max_blocks 512)]) +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]) -GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -b 4096 $GFS_TGT $(util_max_blocks 4096)]) +GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -b 4096 $GFS_TGT $(util_max_blocks 4096)]) AT_CLEANUP
AT_SETUP([Max. resource group size]) -GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -r 2048 $GFS_TGT]) +GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -r 2048 $GFS_TGT]) AT_CLEANUP
AT_SETUP([Min. resource group size]) -GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -r 32 $GFS_TGT]) +GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -r 32 $GFS_TGT]) AT_CLEANUP
AT_SETUP([Max. journal size]) -GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -J 1024 $GFS_TGT]) +GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -J 1024 $GFS_TGT]) AT_CLEANUP
AT_SETUP([Min. journal size]) -GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -J 8 $GFS_TGT]) +GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -J 8 $GFS_TGT]) AT_CLEANUP
AT_SETUP([Max. quota change file size]) -GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -c 64 $GFS_TGT]) +GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -c 64 $GFS_TGT]) AT_CLEANUP
AT_SETUP([Min. quota change file size]) -GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -c 1 $GFS_TGT]) +GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -c 1 $GFS_TGT]) AT_CLEANUP