fix 165 for different block sizes

xfs_io uses the filesystem block size as the default write buffer
size. 165 does not filter the ops counts out of the golden output,
and hnce causes failures because the ops count doesn't match for a
given sized write. Fix this by changing the filter to the generic
xfs_io no-numbers filter.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Alex Elder <aelder@sgi.com>

diff --git a/165 b/165
index d47ad8e2ff8ac907955ebd77cc01bfd714c15ca8..ec349da929ade03ed5e290fe0363e22119166047 100755 (executable)
--- a/165
+++ b/165
@@ -41,16 +41,9 @@ _cleanup()
     rm -f $tmp.*
 }
 
-#
-# Filter out these lines partially
-# From:
-#   40 KiB, 10 ops; 0.0000 sec (4.070 MiB/sec and 1041.9923 ops/sec)
-# To:
-#   40 KiB, 10 ops
-#
 _filter_io()
 {
-    tee -a $seq.full | sed 's/ops;.*/ops/'
+    tee -a $seq.full | _filter_xfs_io
 }
 
 #

diff --git a/165.out b/165.out
index e7c62137d983fda9715eb5f8bde6d844a508266a..705443178a2767c9be397db3bbec005f77099f3b 100644 (file)
--- a/165.out
+++ b/165.out
@@ -1,36 +1,36 @@
 QA output created by 165
 wrote 40960/40960 bytes at offset 0
-40 KiB, 10 ops
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
 *** offset = 0k ***
 
 wrote 4096/4096 bytes at offset 0
-4 KiB, 1 ops
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
 *** offset = 8k ***
 
 wrote 4096/4096 bytes at offset 8192
-4 KiB, 1 ops
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
 *** offset = 16k ***
 
 wrote 4096/4096 bytes at offset 16384
-4 KiB, 1 ops
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
 *** offset = 24k ***
 
 wrote 4096/4096 bytes at offset 24576
-4 KiB, 1 ops
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
 *** offset = 32k ***
 
 wrote 4096/4096 bytes at offset 32768
-4 KiB, 1 ops
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
 *** offset = 40k ***
 
 wrote 4096/4096 bytes at offset 40960
-4 KiB, 1 ops
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 00000000:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 00000010:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 00000020:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
@@ -288,7 +288,7 @@ wrote 4096/4096 bytes at offset 40960
 00000fe0:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 00000ff0:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 read 4096/4096 bytes at offset 0
-4 KiB, 1 ops
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 00004000:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 00004010:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 00004020:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
@@ -546,7 +546,7 @@ read 4096/4096 bytes at offset 0
 00004fe0:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 00004ff0:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 read 4096/4096 bytes at offset 16384
-4 KiB, 1 ops
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 00006000:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 00006010:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 00006020:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
@@ -804,7 +804,7 @@ read 4096/4096 bytes at offset 16384
 00006fe0:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 00006ff0:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 read 4096/4096 bytes at offset 24576
-4 KiB, 1 ops
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 00008000:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 00008010:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 00008020:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
@@ -1062,7 +1062,7 @@ read 4096/4096 bytes at offset 24576
 00008fe0:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 00008ff0:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 read 4096/4096 bytes at offset 32768
-4 KiB, 1 ops
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 0000a000:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 0000a010:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 0000a020:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
@@ -1320,7 +1320,7 @@ read 4096/4096 bytes at offset 32768
 0000afe0:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 0000aff0:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 read 4096/4096 bytes at offset 40960
-4 KiB, 1 ops
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 00002000:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 00002010:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 00002020:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
@@ -1578,4 +1578,4 @@ read 4096/4096 bytes at offset 40960
 00002fe0:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 00002ff0:  cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd  ................
 read 4096/4096 bytes at offset 8192
-4 KiB, 1 ops
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)