diff options
| author | Eric Whitney <enwlinux@gmail.com> | 2022-04-14 10:22:58 -0400 |
|---|---|---|
| committer | Eryu Guan <guaneryu@gmail.com> | 2022-04-17 20:32:05 +0800 |
| commit | ca53ba1e74ebbde853dec09fee93b5e730b9ca1e (patch) | |
| tree | 8cff4831f8da234589b1492b7f241baa09411eb7 | |
| parent | 16676f2f2c3b19f19b5cb259e95139351e6e9bc2 (diff) | |
| download | xfstests-dev-ca53ba1e74ebbde853dec09fee93b5e730b9ca1e.tar.gz | |
common/filter: extend _filter_xfs_io to match -nan
When run on ext4 with sufficiently fast x86_64 hardware, generic/130
sometimes fails because xfs_io can report rate values as -nan:
0.000000 bytes, 0 ops; 0.0000 sec (-nan bytes/sec and -nan ops/sec)
_filter_xfs_io matches the strings 'inf' or 'nan', but not '-nan'. In
that case it fails to convert the actual output to a normalized form
matching generic/130's golden output. Extend the regular expression
used to match xfs_io's output to fix this.
Signed-off-by: Eric Whitney <enwlinux@gmail.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
| -rw-r--r-- | common/filter | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/filter b/common/filter index 5fe86756ef..5b20e848c9 100644 --- a/common/filter +++ b/common/filter @@ -168,9 +168,9 @@ common_line_filter() _filter_xfs_io() { - # Apart from standard numeric values, we also filter out 'inf' and 'nan' - # which can result from division in some cases - sed -e "s/[0-9/.]* [GMKiBbytes]*, [0-9]* ops\; [0-9/:. sec]* ([infa0-9/.]* [EPGMKiBbytes]*\/sec and [infa0-9/.]* ops\/sec)/XXX Bytes, X ops\; XX:XX:XX.X (XXX YYY\/sec and XXX ops\/sec)/" + # Apart from standard numeric values, we also filter out 'inf', 'nan', and + # '-nan' which can result from division in some cases + sed -e "s/[0-9/.]* [GMKiBbytes]*, [0-9]* ops\; [0-9/:. sec]* ([infa0-9/.-]* [EPGMKiBbytes]*\/sec and [infa0-9/.-]* ops\/sec)/XXX Bytes, X ops\; XX:XX:XX.X (XXX YYY\/sec and XXX ops\/sec)/" } # Also filter out the offset part of xfs_io output |