xfs
[Top] [All Lists]

[PATCH] [xfstests]: Don't depend on mkfs.xfs output in some tests

To: xfs@xxxxxxxxxxx
Subject: [PATCH] [xfstests]: Don't depend on mkfs.xfs output in some tests
From: Arkadiusz Miśkiewicz <arekm@xxxxxxxx>
Date: Sat, 2 Oct 2010 09:45:19 +0200
Cc: Arkadiusz Miśkiewicz <arekm@xxxxxxxx>
In-reply-to: <1286005222-16423-1-git-send-email-arekm@xxxxxxxx>
References: <1286005222-16423-1-git-send-email-arekm@xxxxxxxx>
Tests 136 and 206 rely on mkfs.xfs output.

136 test was currently broken with hardcoded mkfs.xfs output (that
contained for example meta-data=/dev/sda8). Drop that part from output.

Ignore projid32bit output existence for test 206.

Signed-off-by: Arkadiusz Miśkiewicz <arekm@xxxxxxxx>
---
 136     |    2 +-
 136.out |    8 --------
 206     |    3 ++-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/136 b/136
index d394594..abc23e9 100755
--- a/136
+++ b/136
@@ -54,7 +54,7 @@ _supported_os IRIX Linux
 _require_scratch
 
 export MKFS_OPTIONS="-i size=512,attr=2"
-_scratch_mkfs_xfs
+_scratch_mkfs_xfs > /dev/null 2>&1
 _scratch_mount
 
 file=$SCRATCH_MNT/file
diff --git a/136.out b/136.out
index 7aa76ac..5c915fa 100644
--- a/136.out
+++ b/136.out
@@ -1,12 +1,4 @@
 QA output created by 136
-meta-data=/dev/sda8              isize=512    agcount=8, agsize=31376 blks
-         =                       sectsz=512   attr=2, parent=0
-data     =                       bsize=4096   blocks=251008, imaxpct=25
-         =                       sunit=0      swidth=0 blks, unwritten=1
-naming   =version 2              bsize=4096  
-log      =internal log           bsize=4096   blocks=1200, version=1
-         =                       sectsz=512   sunit=0 blks
-realtime =none                   extsz=65536  blocks=0, rtextents=0
 inum=67
 core.format = 2 (extents)
 core.size = 0
diff --git a/206 b/206
index 034bbf1..e8bc922 100755
--- a/206
+++ b/206
@@ -76,7 +76,8 @@ dd if=/dev/zero of=$tmpfile bs=1 seek=19998630180864 count=1 
>/dev/null 2>&1 \
 echo "=== mkfs.xfs ==="
 mkfs.xfs -f -bsize=4096 -dagsize=76288719b,size=3905982455b -llazy-count=0 
$tmpfile \
        | sed -e "s,^meta-data=.*isize,meta-data=FILE                   
isize,g" \
-               -e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/"
+               -e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/" \
+               -e "s/, projid32bit=[0-9]//"
 
 mount -o loop $tmpfile $tmpdir || _fail "!!! failed to loopback mount"
 
-- 
1.7.3.1

<Prev in Thread] Current Thread [Next in Thread>