Skip to contentSkip to conversation

xfstests: fix log filtering in 223's testcase

PATCH In review Dmitry Monakhov 2 participants 2 messages Mar 9, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfstests: fix log filtering in 223's testcase

Msg filter was missed in one place, so test failed if $SCRATCH_MNT is different than /mnt/scratch.diff

---
 223     |    3 ++-
 223.out |   10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)
223 +2 -1
index 5c95f7d..7af026c 100755
@@ -86,7 +86,8 @@ for SUNIT_K in 8 16 32 64 128; do
 
 	echo "=== Testing size 1g falloc on ${SUNIT_K}k stripe ==="
 	xfs_io -F -f -c "falloc 0 1g" $SCRATCH_MNT/file-1g-falloc &>> $seq.full
-	src/t_stripealign $SCRATCH_MNT/file-1g-falloc $SUNIT_BLOCKS
+	src/t_stripealign $SCRATCH_MNT/file-1g-falloc $SUNIT_BLOCKS \
+	    | _filter_scratch
 
 	rm -f $SCRATCH_MNT/file-1g-falloc | _filter_scratch
 
223.out +5 -5
index c9588ef..2fb3122 100644
@@ -46,7 +46,7 @@ SCRATCH_MNT/file-3-2097152-write: well-aligned
 SCRATCH_MNT/file-4-2097152-falloc: well-aligned
 SCRATCH_MNT/file-4-2097152-write: well-aligned
 === Testing size 1g falloc on 8k stripe ===
-/mnt/scratch/file-1g-falloc: well-aligned
+SCRATCH_MNT/file-1g-falloc: well-aligned
 === Testing size 1073745920 falloc on 8k stripe ===
 SCRATCH_MNT/file-1073745920-falloc: well-aligned
 === mkfs with su 4 blocks x 4 ===
@@ -96,7 +96,7 @@ SCRATCH_MNT/file-3-4194304-write: well-aligned
 SCRATCH_MNT/file-4-4194304-falloc: well-aligned
 SCRATCH_MNT/file-4-4194304-write: well-aligned
 === Testing size 1g falloc on 16k stripe ===
-/mnt/scratch/file-1g-falloc: well-aligned
+SCRATCH_MNT/file-1g-falloc: well-aligned
 === Testing size 1073745920 falloc on 16k stripe ===
 SCRATCH_MNT/file-1073745920-falloc: well-aligned
 === mkfs with su 8 blocks x 4 ===
@@ -146,7 +146,7 @@ SCRATCH_MNT/file-3-8388608-write: well-aligned
 SCRATCH_MNT/file-4-8388608-falloc: well-aligned
 SCRATCH_MNT/file-4-8388608-write: well-aligned
 === Testing size 1g falloc on 32k stripe ===
-/mnt/scratch/file-1g-falloc: well-aligned
+SCRATCH_MNT/file-1g-falloc: well-aligned
 === Testing size 1073745920 falloc on 32k stripe ===
 SCRATCH_MNT/file-1073745920-falloc: well-aligned
 === mkfs with su 16 blocks x 4 ===
@@ -196,7 +196,7 @@ SCRATCH_MNT/file-3-16777216-write: well-aligned
 SCRATCH_MNT/file-4-16777216-falloc: well-aligned
 SCRATCH_MNT/file-4-16777216-write: well-aligned
 === Testing size 1g falloc on 64k stripe ===
-/mnt/scratch/file-1g-falloc: well-aligned
+SCRATCH_MNT/file-1g-falloc: well-aligned
 === Testing size 1073745920 falloc on 64k stripe ===
 SCRATCH_MNT/file-1073745920-falloc: well-aligned
 === mkfs with su 32 blocks x 4 ===
@@ -246,6 +246,6 @@ SCRATCH_MNT/file-3-33554432-write: well-aligned
 SCRATCH_MNT/file-4-33554432-falloc: well-aligned
 SCRATCH_MNT/file-4-33554432-write: well-aligned
 === Testing size 1g falloc on 128k stripe ===
-/mnt/scratch/file-1g-falloc: well-aligned
+SCRATCH_MNT/file-1g-falloc: well-aligned
 === Testing size 1073745920 falloc on 128k stripe ===
 SCRATCH_MNT/file-1073745920-falloc: well-aligned
Signature · 6 lines
1.6.6

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Dmitry Monakhov

Msg filter was missed in one place, so test failed if $SCRATCH_MNT is different than /mnt/scratch.diff

Whoops, yep! Sorry.

I'll commit this shortly.

Thanks,
-Eric

Quoted 60 lines
---
 223     |    3 ++-
 223.out |   10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)
223 +2 -1
index 5c95f7d..7af026c 100755
@@ -86,7 +86,8 @@ for SUNIT_K in 8 16 32 64 128; do
 
 	echo "=== Testing size 1g falloc on ${SUNIT_K}k stripe ==="
 	xfs_io -F -f -c "falloc 0 1g" $SCRATCH_MNT/file-1g-falloc &>> $seq.full
-	src/t_stripealign $SCRATCH_MNT/file-1g-falloc $SUNIT_BLOCKS
+	src/t_stripealign $SCRATCH_MNT/file-1g-falloc $SUNIT_BLOCKS \
+	    | _filter_scratch
 
 	rm -f $SCRATCH_MNT/file-1g-falloc | _filter_scratch
 
223.out +4 -4
index c9588ef..2fb3122 100644
@@ -46,7 +46,7 @@ SCRATCH_MNT/file-3-2097152-write: well-aligned
 SCRATCH_MNT/file-4-2097152-falloc: well-aligned
 SCRATCH_MNT/file-4-2097152-write: well-aligned
 === Testing size 1g falloc on 8k stripe ===
-/mnt/scratch/file-1g-falloc: well-aligned
+SCRATCH_MNT/file-1g-falloc: well-aligned
 === Testing size 1073745920 falloc on 8k stripe ===
 SCRATCH_MNT/file-1073745920-falloc: well-aligned
 === mkfs with su 4 blocks x 4 ===
@@ -96,7 +96,7 @@ SCRATCH_MNT/file-3-4194304-write: well-aligned
 SCRATCH_MNT/file-4-4194304-falloc: well-aligned
 SCRATCH_MNT/file-4-4194304-write: well-aligned
 === Testing size 1g falloc on 16k stripe ===
-/mnt/scratch/file-1g-falloc: well-aligned
+SCRATCH_MNT/file-1g-falloc: well-aligned
 === Testing size 1073745920 falloc on 16k stripe ===
 SCRATCH_MNT/file-1073745920-falloc: well-aligned
 === mkfs with su 8 blocks x 4 ===
@@ -146,7 +146,7 @@ SCRATCH_MNT/file-3-8388608-write: well-aligned
 SCRATCH_MNT/file-4-8388608-falloc: well-aligned
 SCRATCH_MNT/file-4-8388608-write: well-aligned
 === Testing size 1g falloc on 32k stripe ===
-/mnt/scratch/file-1g-falloc: well-aligned
+SCRATCH_MNT/file-1g-falloc: well-aligned
 === Testing size 1073745920 falloc on 32k stripe ===
 SCRATCH_MNT/file-1073745920-falloc: well-aligned
 === mkfs with su 16 blocks x 4 ===
@@ -196,7 +196,7 @@ SCRATCH_MNT/file-3-16777216-write: well-aligned
 SCRATCH_MNT/file-4-16777216-falloc: well-aligned
 SCRATCH_MNT/file-4-16777216-write: well-aligned
 === Testing size 1g falloc on 64k stripe ===
-/mnt/scratch/file-1g-falloc: well-aligned
+SCRATCH_MNT/file-1g-falloc: well-aligned
 === Testing size 1073745920 falloc on 64k stripe ===
 SCRATCH_MNT/file-1073745920-falloc: well-aligned
 === mkfs with su 32 blocks x 4 ===

223.out SCRATCH_MNT/file-3-33554432-write: well-aligned · line 251

Quoted 7 lines
223.out +1 -1
@@ -246,6 +246,6 @@ SCRATCH_MNT/file-3-33554432-write: well-aligned
 SCRATCH_MNT/file-4-33554432-falloc: well-aligned
 SCRATCH_MNT/file-4-33554432-write: well-aligned
 === Testing size 1g falloc on 128k stripe ===
-/mnt/scratch/file-1g-falloc: well-aligned
+SCRATCH_MNT/file-1g-falloc: well-aligned
 === Testing size 1073745920 falloc on 128k stripe ===
 SCRATCH_MNT/file-1073745920-falloc: well-aligned

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs