generic/45[34]: don't warn on mixed bidirectional characters

We're dropping this warning from xfs_scrub because the warning is
incorrect, so let's make sure the QA system checks that it's gone.

Cc: gedalya@gedalya.net
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Zorro Lang <zlang@kernel.org>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/tests/generic/453 b/tests/generic/453
index 0193b010306c48892ede82bd1b020dc07538c1c3..9b121d995ad1ab56272f4f7195dba605ebe76728 100755 (executable)
--- a/tests/generic/453
+++ b/tests/generic/453
@@ -247,6 +247,10 @@ setf "tags_m\xf3\xa0\x81\xadoocow.txt" u1
 # totally hidden name? "(Hi)" is the file name
 setf "\xf3\xa0\x80\xa8\xf3\xa0\x81\x88\xf3\xa0\x81\xa9\xf3\xa0\x80\xa9" "(Hi)"
 
+# Gedalya complained about being flagged for mixing Hebrew (RTL) and Latin
+# (LTR) codepoints in the same name.  This is a common practice.
+setf "\xd7\xa2\xd7\x91\xd7\xa8\xd7\x99\xd7\xaa.pdf" "mixed rtl and ltr chars?"
+
 ls -laR $testdir >> $seqres.full
 
 echo "Test files"
@@ -359,6 +363,10 @@ testf "tags_m\xf3\xa0\x81\xadoocow.txt" u1
 # totally hidden name? "(Hi)" is the file name
 testf "\xf3\xa0\x80\xa8\xf3\xa0\x81\x88\xf3\xa0\x81\xa9\xf3\xa0\x80\xa9" "(Hi)"
 
+# Gedalya complained about being flagged for mixing Hebrew (RTL) and Latin
+# (LTR) codepoints in the same name.  This is a common practice.
+testf "\xd7\xa2\xd7\x91\xd7\xa8\xd7\x99\xd7\xaa.pdf" "mixed rtl and ltr chars?"
+
 echo "Uniqueness of inodes?"
 stat -c '%i' "${testdir}/"* | sort | uniq -c | while read nr inum; do
        if [ "${nr}" -gt 1 ]; then
@@ -403,6 +411,8 @@ if _check_xfs_scrub_does_unicode "$SCRATCH_MNT" "$SCRATCH_DEV"; then
                grep -q 'tags_m.xf3.xa0.x81' $tmp.scrub || echo "No complaints about deprecated unicode tags in a name?"
        fi
 
+       grep -q 'mixes bidirectional characters' $tmp.scrub && echo "Unnecessary complaints about mixed bidi characters in a name?"
+
        echo "Actual xfs_scrub output:" >> $seqres.full
        cat $tmp.scrub >> $seqres.full
 fi

diff --git a/tests/generic/454 b/tests/generic/454
index 3454cae5d5ea6cc660d9705a2af5c51ce1cceed6..81c9a721561cf8e337bf9978af0cbaf0f9634040 100755 (executable)
--- a/tests/generic/454
+++ b/tests/generic/454
@@ -168,6 +168,10 @@ setf "tags_m\xf3\xa0\x81\xadoocow.txt" u1
 # totally hidden name? "(Hi)" is the file name
 setf "\xf3\xa0\x80\xa8\xf3\xa0\x81\x88\xf3\xa0\x81\xa9\xf3\xa0\x80\xa9" "(Hi)"
 
+# Gedalya complained about being flagged for mixing Hebrew (RTL) and Latin
+# (LTR) codepoints in the same name.  This is a common practice.
+setf "\xd7\xa2\xd7\x91\xd7\xa8\xd7\x99\xd7\xaa.pdf" "mixed rtl and ltr chars?"
+
 _getfattr --absolute-names -d "${testfile}" >> $seqres.full
 
 echo "Test files"
@@ -256,6 +260,10 @@ testf "tags_m\xf3\xa0\x81\xadoocow.txt" u1
 
 # totally hidden name? "(Hi)" is the file name
 testf "\xf3\xa0\x80\xa8\xf3\xa0\x81\x88\xf3\xa0\x81\xa9\xf3\xa0\x80\xa9" "(Hi)"
+#
+# Gedalya complained about being flagged for mixing Hebrew (RTL) and Latin
+# (LTR) codepoints in the same name.  This is a common practice.
+testf "\xd7\xa2\xd7\x91\xd7\xa8\xd7\x99\xd7\xaa.pdf" "mixed rtl and ltr chars?"
 
 echo "Uniqueness of keys?"
 crazy_keys="$(_getfattr --absolute-names -d "${testfile}" | grep -E -c '(french_|chinese_|greek_|arabic_|urk)')"
@@ -285,6 +293,8 @@ if _check_xfs_scrub_does_unicode "$SCRATCH_MNT" "$SCRATCH_DEV"; then
                grep -q 'tags_m.xf3.xa0.x81' $tmp.scrub || echo "No complaints about deprecated unicode tags in a name?"
        fi
 
+       grep -q 'mixes bidirectional characters' $tmp.scrub && echo "Unnecessary complaints about mixed bidi characters in a name?"
+
        echo "Actual xfs_scrub output:" >> $seqres.full
        echo "${output}" >> $seqres.full
 fi