Modified noalign to mount option so test would pass on IRIX

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

  Modified noalign to mount option so test would pass on IRIX

diff --git a/018 b/018
index 5565675c193989d741f2cae2dda434ef5041f92c..c0aaf4be8e7356468c4003774f323592518a45c4 100755 (executable)
--- a/018
+++ b/018
@@ -69,8 +69,8 @@ do
     if [ "$mkfs" = "#" ]; then
        continue
     fi
-    export MKFS_OPTIONS="-d noalign -l $mkfs"
-    export MOUNT_OPTIONS="-o $mnt"
+    export MKFS_OPTIONS="-l $mkfs"
+    export MOUNT_OPTIONS="-o noalign,$mnt"
     _mkfs_log
     _create_log
     _check_log

diff --git a/018.out b/018.out
index 5b2c2853f90024612eafe4bc02f11f66fec9e8b1..549111e175325d7e3562ae6a2574f4c9878b6a28 100644 (file)
--- a/018.out
+++ b/018.out
@@ -1,17 +1,17 @@
 QA output created by 018
 *** init FS
-*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=32k.mkfs-dnoalign-lversion=1.filtered
-*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-dnoalign-lversion=1.filtered
-*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-dnoalign-lversion=1.filtered
-*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=32k.mkfs-dnoalign-lversion=2.filtered
-*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-dnoalign-lversion=2.filtered
-*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-dnoalign-lversion=2.filtered
-*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=64k.mkfs-dnoalign-lversion=2.filtered
-*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=64k.mkfs-dnoalign-lversion=2.filtered
-*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=64k.mkfs-dnoalign-lversion=2.filtered
-*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=128k.mkfs-dnoalign-lversion=2.filtered
-*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=128k.mkfs-dnoalign-lversion=2.filtered
-*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=128k.mkfs-dnoalign-lversion=2.filtered
-*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=256k.mkfs-dnoalign-lversion=2.filtered
-*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=256k.mkfs-dnoalign-lversion=2.filtered
-*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=256k.mkfs-dnoalign-lversion=2.filtered
+*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=32k.mkfs-lversion=1.filtered
+*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=32k.mkfs-lversion=1.filtered
+*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=32k.mkfs-lversion=1.filtered
+*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=32k.mkfs-lversion=2.filtered
+*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=32k.mkfs-lversion=2.filtered
+*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=32k.mkfs-lversion=2.filtered
+*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=64k.mkfs-lversion=2.filtered
+*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=64k.mkfs-lversion=2.filtered
+*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=64k.mkfs-lversion=2.filtered
+*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=128k.mkfs-lversion=2.filtered
+*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=128k.mkfs-lversion=2.filtered
+*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=128k.mkfs-lversion=2.filtered
+*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=256k.mkfs-lversion=2.filtered
+*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=256k.mkfs-lversion=2.filtered
+*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=256k.mkfs-lversion=2.filtered