common/fuzzy: if the fuzz verb is random, keep fuzzing until we get a new value

[xfstests-dev.git] / common / filter

diff --git a/common/filter b/common/filter
index 010f080b1c2f945b8a28203c116ff91c1b293eb5..0cb458b0051f9d360ec449841249f88042c6fe6b 100644 (file)
--- a/common/filter
+++ b/common/filter
@@ -280,31 +280,29 @@ _filter_xfs_io_pages_modified()
 
 _filter_test_dir()
 {
-       if ( echo $TEST_DIR | grep -q $TEST_DEV ); then
-               # TEST_DEV is substr of TEST_DIR (e.g. /mnt and /mnt/ovl-mnt)
-               # substitute TEST_DIR first
-               sed -e "s,$TEST_DIR,TEST_DIR,g" \
-                   -e "s,$TEST_DEV,TEST_DEV,g"
-       else
-               # TEST_DIR maybe a substr of TEST_DIR (e.g. /vdc and /dev/vdc)
-               # substitute TEST_DEV first
-               sed -e "s,$TEST_DEV,TEST_DEV,g" \
-                   -e "s,$TEST_DIR,TEST_DIR,g"
-       fi
+       # TEST_DEV may be a prefix of TEST_DIR (e.g. /mnt, /mnt/ovl-mnt)
+       # so substitute TEST_DIR first
+       sed -e "s,\B$TEST_DIR,TEST_DIR,g" \
+           -e "s,\B$TEST_DEV,TEST_DEV,g"
 }
 
 _filter_scratch()
 {
-       if ( echo $SCRATCH_MNT | grep -q $SCRATCH_DEV ); then
-               # SCRATCH_DEV is substr of SCRATCH_MNT
-               sed -e "s,$SCRATCH_MNT,SCRATCH_MNT,g" \
-                   -e "s,$SCRATCH_DEV,SCRATCH_DEV,g" \
-                   -e "/.use_space/d"
+       # SCRATCH_DEV may be a prefix of SCRATCH_MNT (e.g. /mnt, /mnt/ovl-mnt)
+       # so substitute SCRATCH_MNT first
+       sed -e "s,\B$SCRATCH_MNT,SCRATCH_MNT,g" \
+           -e "s,\B$SCRATCH_DEV,SCRATCH_DEV,g" \
+           -e "/.use_space/d"
+}
+
+_filter_testdir_and_scratch()
+{
+       # filter both $TEST_DIR and $SCRATCH_MNT, but always filter the longer
+       # string first if the other string is a substring of the first one
+       if echo "$TEST_DIR" | grep -q "$SCRATCH_MNT"; then
+               _filter_test_dir | _filter_scratch
        else
-               # SCRATCH_MNT maybe a substr of SCRATCH_DEV
-               sed -e "s,$SCRATCH_DEV,SCRATCH_DEV,g" \
-                   -e "s,$SCRATCH_MNT,SCRATCH_MNT,g" \
-                   -e "/.use_space/d"
+               _filter_scratch | _filter_test_dir
        fi
 }
 
@@ -324,7 +322,7 @@ _filter_quota()
 {
        # Long dev name might be split onto its own line; last
        # seds remove that newline if present
-       _filter_scratch | _filter_test_dir | _filter_spaces | \
+       _filter_testdir_and_scratch | _filter_spaces | \
        sed -e 'N;s/SCRATCH_DEV\n/SCRATCH_DEV/g' | \
        sed -e 'N;s/TEST_DEV\n/TEST_DEV/g'
 }
@@ -424,5 +422,56 @@ _filter_lostfound()
        sed -e '/^lost+found$/d'
 }
 
+_filter_ovl_dirs()
+{
+       sed -e "s,$OVL_LOWER,OVL_LOWER,g" \
+           -e "s,$OVL_UPPER,OVL_UPPER,g" \
+           -e "s,$OVL_WORK,OVL_WORK,g"
+}
+
+# interpret filefrag output,
+# eg. "physical 1234, length 10, logical 5678" -> "1234#10#5678"
+_filter_filefrag()
+{
+       perl -ne '
+       if (/blocks? of (\d+) bytes/) {
+               $blocksize = $1;
+               next
+       }
+       ($ext, $logical, $physical, $length) =
+               (/^\s*(\d+):\s+(\d+)..\s+\d+:\s+(\d+)..\s+\d+:\s+(\d+):/)
+       or next;
+       ($flags) = /.*:\s*(\S*)$/;
+       print $physical * $blocksize, "#",
+             $length * $blocksize, "#",
+             $logical * $blocksize, "#",
+             $flags, "\n"'
+}
+
+# We generate WARNINGs on purpose when applications mix buffered/mmap IO with
+# direct IO on the same file. This is a helper for _check_dmesg() to filter out
+# such warnings.
+_filter_aiodio_dmesg()
+{
+       local warn1="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_dio_aio_write.*"
+       local warn2="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_dio_aio_read.*"
+       local warn3="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_read_iter.*"
+       local warn4="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_aio_read.*"
+       local warn5="WARNING:.*fs/iomap\.c:.*iomap_dio_rw.*"
+       local warn6="WARNING:.*fs/xfs/xfs_aops\.c:.*__xfs_get_blocks.*"
+       local warn7="WARNING:.*fs/iomap\.c:.*iomap_dio_actor.*"
+       local warn8="WARNING:.*fs/iomap\.c:.*iomap_dio_complete.*"
+       local warn9="WARNING:.*fs/direct-io\.c:.*dio_complete.*"
+       sed -e "s#$warn1#Intentional warnings in xfs_file_dio_aio_write#" \
+           -e "s#$warn2#Intentional warnings in xfs_file_dio_aio_read#" \
+           -e "s#$warn3#Intentional warnings in xfs_file_read_iter#" \
+           -e "s#$warn4#Intentional warnings in xfs_file_aio_read#" \
+           -e "s#$warn5#Intentional warnings in iomap_dio_rw#" \
+           -e "s#$warn6#Intentional warnings in __xfs_get_blocks#" \
+           -e "s#$warn7#Intentional warnings in iomap_dio_actor#" \
+           -e "s#$warn8#Intentional warnings in iomap_dio_complete#" \
+           -e "s#$warn9#Intentional warnings in dio_complete#"
+}
+
 # make sure this script returns success
 /bin/true