|
 |
903fa7 |
commit 9a070d60d70937da51f1430c6626327c971dec33
|
|
|
903fa7 |
Author: Andrew Price <anprice@redhat.com>
|
|
|
903fa7 |
Date: Wed Jan 22 18:46:53 2014 +0000
|
|
|
903fa7 |
|
|
|
903fa7 |
mkfs.gfs2 tests: Enable debug output
|
|
|
903fa7 |
|
|
|
903fa7 |
Enable debug output of mkfs.gfs2 tests and define the base options as a
|
|
|
903fa7 |
shell variable to make them easier to maintain.
|
|
|
903fa7 |
|
|
|
903fa7 |
Resolves: rhbz#1059443
|
|
|
903fa7 |
|
|
|
903fa7 |
Signed-off-by: Andrew Price <anprice@redhat.com>
|
|
|
903fa7 |
|
|
|
903fa7 |
diff --git a/tests/atlocal.in b/tests/atlocal.in
|
|
|
903fa7 |
index 660c87a..b021b13 100644
|
|
|
903fa7 |
--- a/tests/atlocal.in
|
|
|
903fa7 |
+++ b/tests/atlocal.in
|
|
|
903fa7 |
@@ -1,5 +1,6 @@
|
|
|
903fa7 |
GFS_TGT="$abs_builddir/testvol"
|
|
|
903fa7 |
GFS_TGT_SZ=10
|
|
|
903fa7 |
+GFS_MKFS="mkfs.gfs2 -O -D"
|
|
|
903fa7 |
|
|
|
903fa7 |
gfs_max_blocks()
|
|
|
903fa7 |
{
|
|
|
903fa7 |
diff --git a/tests/mkfs.at b/tests/mkfs.at
|
|
|
903fa7 |
index a3973af..2616109 100644
|
|
|
903fa7 |
--- a/tests/mkfs.at
|
|
|
903fa7 |
+++ b/tests/mkfs.at
|
|
|
903fa7 |
@@ -2,70 +2,70 @@ AT_TESTED([mkfs.gfs2])
|
|
|
903fa7 |
AT_BANNER([mkfs.gfs2 tests])
|
|
|
903fa7 |
|
|
|
903fa7 |
AT_SETUP([Locking protocol validation])
|
|
|
903fa7 |
-AT_CHECK([mkfs.gfs2 -O -p badprotocol $GFS_TGT], 255, [ignore], [ignore])
|
|
|
903fa7 |
+AT_CHECK([$GFS_MKFS -p badprotocol $GFS_TGT], 255, [ignore], [ignore])
|
|
|
903fa7 |
AT_CLEANUP
|
|
|
903fa7 |
|
|
|
903fa7 |
AT_SETUP([Resource group size validation])
|
|
|
903fa7 |
-AT_CHECK([mkfs.gfs2 -O -p lock_nolock -r 31 $GFS_TGT], 255, [ignore], [ignore])
|
|
|
903fa7 |
-AT_CHECK([mkfs.gfs2 -O -p lock_nolock -r 2049 $GFS_TGT], 255, [ignore], [ignore])
|
|
|
903fa7 |
+AT_CHECK([$GFS_MKFS -p lock_nolock -r 31 $GFS_TGT], 255, [ignore], [ignore])
|
|
|
903fa7 |
+AT_CHECK([$GFS_MKFS -p lock_nolock -r 2049 $GFS_TGT], 255, [ignore], [ignore])
|
|
|
903fa7 |
AT_CLEANUP
|
|
|
903fa7 |
|
|
|
903fa7 |
AT_SETUP([Journal size validation])
|
|
|
903fa7 |
-AT_CHECK([mkfs.gfs2 -O -p lock_nolock -J 7 $GFS_TGT], 255, [ignore], [ignore])
|
|
|
903fa7 |
-AT_CHECK([mkfs.gfs2 -O -p lock_nolock -J 1025 $GFS_TGT], 255, [ignore], [ignore])
|
|
|
903fa7 |
+AT_CHECK([$GFS_MKFS -p lock_nolock -J 7 $GFS_TGT], 255, [ignore], [ignore])
|
|
|
903fa7 |
+AT_CHECK([$GFS_MKFS -p lock_nolock -J 1025 $GFS_TGT], 255, [ignore], [ignore])
|
|
|
903fa7 |
AT_CLEANUP
|
|
|
903fa7 |
|
|
|
903fa7 |
AT_SETUP([Block count validation])
|
|
|
903fa7 |
GFS_TGT_REGEN
|
|
|
903fa7 |
-AT_CHECK([mkfs.gfs2 -O -p lock_nolock -b 512 $GFS_TGT $(($(gfs_max_blocks 512)+1))], 255, [ignore], [ignore])
|
|
|
903fa7 |
-AT_CHECK([mkfs.gfs2 -O -p lock_nolock -b 4096 $GFS_TGT $(($(gfs_max_blocks 4096)+1))], 255, [ignore], [ignore])
|
|
|
903fa7 |
+AT_CHECK([$GFS_MKFS -p lock_nolock -b 512 $GFS_TGT $(($(gfs_max_blocks 512)+1))], 255, [ignore], [ignore])
|
|
|
903fa7 |
+AT_CHECK([$GFS_MKFS -p lock_nolock -b 4096 $GFS_TGT $(($(gfs_max_blocks 4096)+1))], 255, [ignore], [ignore])
|
|
|
903fa7 |
AT_CLEANUP
|
|
|
903fa7 |
|
|
|
903fa7 |
AT_SETUP([Quota change file size validation])
|
|
|
903fa7 |
-AT_CHECK([mkfs.gfs2 -O -p lock_nolock -c 0 $GFS_TGT], 255, [ignore], [ignore])
|
|
|
903fa7 |
-AT_CHECK([mkfs.gfs2 -O -p lock_nolock -c 65 $GFS_TGT], 255, [ignore], [ignore])
|
|
|
903fa7 |
+AT_CHECK([$GFS_MKFS -p lock_nolock -c 0 $GFS_TGT], 255, [ignore], [ignore])
|
|
|
903fa7 |
+AT_CHECK([$GFS_MKFS -p lock_nolock -c 65 $GFS_TGT], 255, [ignore], [ignore])
|
|
|
903fa7 |
AT_CLEANUP
|
|
|
903fa7 |
|
|
|
903fa7 |
AT_SETUP([Locking protocols])
|
|
|
903fa7 |
-GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock $GFS_TGT])
|
|
|
903fa7 |
-GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_dlm -t foo:bar $GFS_TGT])
|
|
|
903fa7 |
+GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock $GFS_TGT])
|
|
|
903fa7 |
+GFS_FSCK_CHECK([$GFS_MKFS -p lock_dlm -t foo:bar $GFS_TGT])
|
|
|
903fa7 |
AT_CLEANUP
|
|
|
903fa7 |
|
|
|
903fa7 |
AT_SETUP([Valid block sizes 512-4096])
|
|
|
903fa7 |
-GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -b 512 $GFS_TGT])
|
|
|
903fa7 |
-GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -b 1024 $GFS_TGT])
|
|
|
903fa7 |
-GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -b 2048 $GFS_TGT])
|
|
|
903fa7 |
-GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -b 4096 $GFS_TGT])
|
|
|
903fa7 |
+GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -b 512 $GFS_TGT])
|
|
|
903fa7 |
+GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -b 1024 $GFS_TGT])
|
|
|
903fa7 |
+GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -b 2048 $GFS_TGT])
|
|
|
903fa7 |
+GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -b 4096 $GFS_TGT])
|
|
|
903fa7 |
AT_CLEANUP
|
|
|
903fa7 |
|
|
|
903fa7 |
AT_SETUP([Max. blocks, min. block size])
|
|
|
903fa7 |
-GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -b 512 $GFS_TGT $(gfs_max_blocks 512)])
|
|
|
903fa7 |
+GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -b 512 $GFS_TGT $(gfs_max_blocks 512)])
|
|
|
903fa7 |
AT_CLEANUP
|
|
|
903fa7 |
|
|
|
903fa7 |
AT_SETUP([Max. blocks, max. block size])
|
|
|
903fa7 |
-GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -b 4096 $GFS_TGT $(util_max_blocks 4096)])
|
|
|
903fa7 |
+GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -b 4096 $GFS_TGT $(util_max_blocks 4096)])
|
|
|
903fa7 |
AT_CLEANUP
|
|
|
903fa7 |
|
|
|
903fa7 |
AT_SETUP([Max. resource group size])
|
|
|
903fa7 |
-GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -r 2048 $GFS_TGT])
|
|
|
903fa7 |
+GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -r 2048 $GFS_TGT])
|
|
|
903fa7 |
AT_CLEANUP
|
|
|
903fa7 |
|
|
|
903fa7 |
AT_SETUP([Min. resource group size])
|
|
|
903fa7 |
-GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -r 32 $GFS_TGT])
|
|
|
903fa7 |
+GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -r 32 $GFS_TGT])
|
|
|
903fa7 |
AT_CLEANUP
|
|
|
903fa7 |
|
|
|
903fa7 |
AT_SETUP([Max. journal size])
|
|
|
903fa7 |
-GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -J 1024 $GFS_TGT])
|
|
|
903fa7 |
+GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -J 1024 $GFS_TGT])
|
|
|
903fa7 |
AT_CLEANUP
|
|
|
903fa7 |
|
|
|
903fa7 |
AT_SETUP([Min. journal size])
|
|
|
903fa7 |
-GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -J 8 $GFS_TGT])
|
|
|
903fa7 |
+GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -J 8 $GFS_TGT])
|
|
|
903fa7 |
AT_CLEANUP
|
|
|
903fa7 |
|
|
|
903fa7 |
AT_SETUP([Max. quota change file size])
|
|
|
903fa7 |
-GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -c 64 $GFS_TGT])
|
|
|
903fa7 |
+GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -c 64 $GFS_TGT])
|
|
|
903fa7 |
AT_CLEANUP
|
|
|
903fa7 |
|
|
|
903fa7 |
AT_SETUP([Min. quota change file size])
|
|
|
903fa7 |
-GFS_FSCK_CHECK([mkfs.gfs2 -O -p lock_nolock -c 1 $GFS_TGT])
|
|
|
903fa7 |
+GFS_FSCK_CHECK([$GFS_MKFS -p lock_nolock -c 1 $GFS_TGT])
|
|
|
903fa7 |
AT_CLEANUP
|