Fix up test 096 to work for both internal and external logs.

Merge of master-melb:xfs-cmds:23131a by kenmcd.

diff --git a/096 b/096
index 45f393732f2a271505469522e289103ccef9270b..2ed7d027cedcd6b6fb8a3188c93884c173daf2fc 100755 (executable)
--- a/096
+++ b/096
@@ -105,6 +105,14 @@ _supported_os IRIX Linux
 _require_scratch
 _require_v2log
 
+# choose .out file based on internal/external log
+rm -f $seq.out
+if [ "$USE_EXTERNAL" = yes ]; then
+       ln -s $seq.external $seq.out
+else
+       ln -s $seq.internal $seq.out
+fi
+
 # maximum log record size
 max_lr_size=`expr 256 \* 1024`
 

diff --git a/096.external b/096.external
new file mode 100644 (file)
index 0000000..51ed8ed
--- /dev/null
+++ b/096.external
@@ -0,0 +1,53 @@
+QA output created by 096
+
+# su too big but must be a multiple of fs block size too
+--- mkfs=-l version=2,su=262656 ---
+log stripe unit (262656) must be a multiple of the block size (4096)
+
+
+# test log stripe greater than LR size
+--- mkfs=-l version=2,su=266240 ---
+log stripe unit (266240 bytes) is too large (maximum is 256KiB)
+log stripe unit adjusted to 32KiB
+meta-data=DEV isize=256    agcount=N, agsize=N blks
+data     =                       bsize=4096   blocks=N, imaxpct=25
+         =                       sunit=0      swidth=0 blks, unwritten=1
+naming   =version 2              bsize=4096
+log      =LOG                    bsize=4096   blocks=N, version=2
+         =                       sunit=8 blks
+realtime =none                   extsz=65536  blocks=N, rtextents=0
+
+
+# same test but get log stripe from data stripe
+--- mkfs=-l version=2 -d su=266240,sw=1 ---
+meta-data=DEV isize=256    agcount=N, agsize=N blks
+data     =                       bsize=4096   blocks=N, imaxpct=25
+         =                       sunit=65     swidth=65 blks, unwritten=1
+naming   =version 2              bsize=4096
+log      =LOG                    bsize=4096   blocks=N, version=2
+         =                       sunit=0 blks
+realtime =none                   extsz=65536  blocks=N, rtextents=0
+
+
+# test out data stripe
+--- mkfs=-d su=266240,sw=1 ---
+meta-data=DEV isize=256    agcount=N, agsize=N blks
+data     =                       bsize=4096   blocks=N, imaxpct=25
+         =                       sunit=65     swidth=65 blks, unwritten=1
+naming   =version 2              bsize=4096
+log      =LOG                    bsize=4096   blocks=N, version=1
+         =                       sunit=0 blks
+realtime =none                   extsz=65536  blocks=N, rtextents=0
+
+
+# test out data stripe the same but using sunit & swidth
+--- mkfs=-d sunit=520,swidth=520 ---
+meta-data=DEV isize=256    agcount=N, agsize=N blks
+data     =                       bsize=4096   blocks=N, imaxpct=25
+         =                       sunit=65     swidth=65 blks, unwritten=1
+naming   =version 2              bsize=4096
+log      =LOG                    bsize=4096   blocks=N, version=1
+         =                       sunit=0 blks
+realtime =none                   extsz=65536  blocks=N, rtextents=0
+
+

diff --git a/096.internal b/096.internal
new file mode 100644 (file)
index 0000000..5d091fe
--- /dev/null
+++ b/096.internal
@@ -0,0 +1,55 @@
+QA output created by 096
+
+# su too big but must be a multiple of fs block size too
+--- mkfs=-l version=2,su=262656 ---
+log stripe unit (262656) must be a multiple of the block size (4096)
+
+
+# test log stripe greater than LR size
+--- mkfs=-l version=2,su=266240 ---
+log stripe unit (266240 bytes) is too large (maximum is 256KiB)
+log stripe unit adjusted to 32KiB
+meta-data=DEV isize=256    agcount=N, agsize=N blks
+data     =                       bsize=4096   blocks=N, imaxpct=25
+         =                       sunit=0      swidth=0 blks, unwritten=1
+naming   =version 2              bsize=4096
+log      =LOG                    bsize=4096   blocks=N, version=2
+         =                       sunit=8 blks
+realtime =none                   extsz=65536  blocks=N, rtextents=0
+
+
+# same test but get log stripe from data stripe
+--- mkfs=-l version=2 -d su=266240,sw=1 ---
+log stripe unit (266240 bytes) is too large (maximum is 256KiB)
+log stripe unit adjusted to 32KiB
+meta-data=DEV isize=256    agcount=N, agsize=N blks
+data     =                       bsize=4096   blocks=N, imaxpct=25
+         =                       sunit=65     swidth=65 blks, unwritten=1
+naming   =version 2              bsize=4096
+log      =LOG                    bsize=4096   blocks=N, version=2
+         =                       sunit=8 blks
+realtime =none                   extsz=65536  blocks=N, rtextents=0
+
+
+# test out data stripe
+--- mkfs=-d su=266240,sw=1 ---
+meta-data=DEV isize=256    agcount=N, agsize=N blks
+data     =                       bsize=4096   blocks=N, imaxpct=25
+         =                       sunit=65     swidth=65 blks, unwritten=1
+naming   =version 2              bsize=4096
+log      =LOG                    bsize=4096   blocks=N, version=1
+         =                       sunit=0 blks
+realtime =none                   extsz=65536  blocks=N, rtextents=0
+
+
+# test out data stripe the same but using sunit & swidth
+--- mkfs=-d sunit=520,swidth=520 ---
+meta-data=DEV isize=256    agcount=N, agsize=N blks
+data     =                       bsize=4096   blocks=N, imaxpct=25
+         =                       sunit=65     swidth=65 blks, unwritten=1
+naming   =version 2              bsize=4096
+log      =LOG                    bsize=4096   blocks=N, version=1
+         =                       sunit=0 blks
+realtime =none                   extsz=65536  blocks=N, rtextents=0
+
+

diff --git a/096.out b/096.out
deleted file mode 100644 (file)
index 5d091fe..0000000
--- a/096.out
+++ /dev/null
@@ -1,55 +0,0 @@
-QA output created by 096
-
-# su too big but must be a multiple of fs block size too
---- mkfs=-l version=2,su=262656 ---
-log stripe unit (262656) must be a multiple of the block size (4096)
-
-
-# test log stripe greater than LR size
---- mkfs=-l version=2,su=266240 ---
-log stripe unit (266240 bytes) is too large (maximum is 256KiB)
-log stripe unit adjusted to 32KiB
-meta-data=DEV isize=256    agcount=N, agsize=N blks
-data     =                       bsize=4096   blocks=N, imaxpct=25
-         =                       sunit=0      swidth=0 blks, unwritten=1
-naming   =version 2              bsize=4096
-log      =LOG                    bsize=4096   blocks=N, version=2
-         =                       sunit=8 blks
-realtime =none                   extsz=65536  blocks=N, rtextents=0
-
-
-# same test but get log stripe from data stripe
---- mkfs=-l version=2 -d su=266240,sw=1 ---
-log stripe unit (266240 bytes) is too large (maximum is 256KiB)
-log stripe unit adjusted to 32KiB
-meta-data=DEV isize=256    agcount=N, agsize=N blks
-data     =                       bsize=4096   blocks=N, imaxpct=25
-         =                       sunit=65     swidth=65 blks, unwritten=1
-naming   =version 2              bsize=4096
-log      =LOG                    bsize=4096   blocks=N, version=2
-         =                       sunit=8 blks
-realtime =none                   extsz=65536  blocks=N, rtextents=0
-
-
-# test out data stripe
---- mkfs=-d su=266240,sw=1 ---
-meta-data=DEV isize=256    agcount=N, agsize=N blks
-data     =                       bsize=4096   blocks=N, imaxpct=25
-         =                       sunit=65     swidth=65 blks, unwritten=1
-naming   =version 2              bsize=4096
-log      =LOG                    bsize=4096   blocks=N, version=1
-         =                       sunit=0 blks
-realtime =none                   extsz=65536  blocks=N, rtextents=0
-
-
-# test out data stripe the same but using sunit & swidth
---- mkfs=-d sunit=520,swidth=520 ---
-meta-data=DEV isize=256    agcount=N, agsize=N blks
-data     =                       bsize=4096   blocks=N, imaxpct=25
-         =                       sunit=65     swidth=65 blks, unwritten=1
-naming   =version 2              bsize=4096
-log      =LOG                    bsize=4096   blocks=N, version=1
-         =                       sunit=0 blks
-realtime =none                   extsz=65536  blocks=N, rtextents=0
-
-