common/rc: fix unicode checker detection in xfs_scrub

[xfstests-dev.git] / common / rc

diff --git a/common/rc b/common/rc
index a419b3ba53f67f89041fe80e2e726985b87d986e..b3289de985d80f6c8d40f533c00ae76d6ce90416 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -1592,7 +1592,7 @@ _require_scratch_nocheck()
                        _notrun "this test requires a valid \$SCRATCH_MNT"
                fi
                ;;
-       nfs*|ceph)
+       nfs*)
                echo $SCRATCH_DEV | grep -q ":/" > /dev/null 2>&1
                if [ -z "$SCRATCH_DEV" -o "$?" != "0" ]; then
                        _notrun "this test requires a valid \$SCRATCH_DEV"
@@ -1601,6 +1601,15 @@ _require_scratch_nocheck()
                        _notrun "this test requires a valid \$SCRATCH_MNT"
                fi
                ;;
+       ceph)
+               echo $SCRATCH_DEV | grep -qE "=/|:/" > /dev/null 2>&1
+               if [ -z "$SCRATCH_DEV" -o "$?" != "0" ]; then
+                       _notrun "this test requires a valid \$SCRATCH_DEV"
+               fi
+               if [ ! -d "$SCRATCH_MNT" ]; then
+                       _notrun "this test requires a valid \$SCRATCH_MNT"
+               fi
+               ;;
        pvfs2)
                echo $SCRATCH_DEV | grep -q "://" > /dev/null 2>&1
                if [ -z "$SCRATCH_DEV" -o "$?" != "0" ]; then
@@ -1783,7 +1792,7 @@ _require_test()
                        _notrun "this test requires a valid \$TEST_DIR"
                fi
                ;;
-       nfs*|ceph)
+       nfs*)
                echo $TEST_DEV | grep -q ":/" > /dev/null 2>&1
                if [ -z "$TEST_DEV" -o "$?" != "0" ]; then
                        _notrun "this test requires a valid \$TEST_DEV"
@@ -1792,6 +1801,15 @@ _require_test()
                        _notrun "this test requires a valid \$TEST_DIR"
                fi
                ;;
+       ceph)
+               echo $TEST_DEV | grep -qE "=/|:/" > /dev/null 2>&1
+               if [ -z "$TEST_DEV" -o "$?" != "0" ]; then
+                       _notrun "this test requires a valid \$TEST_DEV"
+               fi
+               if [ ! -d "$TEST_DIR" ]; then
+                       _notrun "this test requires a valid \$TEST_DIR"
+               fi
+               ;;
        cifs)
                echo $TEST_DEV | grep -q "//" > /dev/null 2>&1
                if [ -z "$TEST_DEV" -o "$?" != "0" ]; then
@@ -2009,7 +2027,7 @@ _require_sane_bdev_flush()
 # Returns 0 if DAX will be used, 1 if DAX is not going to be used.
 __scratch_uses_fsdax()
 {
-       local ops=$(_normalize_mount_options)
+       local ops=$(_normalize_mount_options "$MOUNT_OPTIONS")
 
        echo $ops | egrep -qw "dax(=always| |$)" && return 0
        echo $ops | grep -qw "dax=never" && return 1
@@ -3688,7 +3706,7 @@ _has_metadata_journaling()
                        return 1
                }
                # ext4 might not load a journal
-               if _normalize_mount_options | grep -qw "noload"; then
+               if _normalize_mount_options "$MOUNT_OPTIONS" | grep -qw "noload"; then
                        echo "mount option \"noload\" not allowed in this test"
                        return 1
                fi
@@ -3852,20 +3870,20 @@ _require_cloner()
                _notrun "cloner binary not present at $CLONER_PROG"
 }
 
-# Normalize mount options from global $MOUNT_OPTIONS
-# Convert options like "-o opt1,opt2 -oopt3" to
-# "opt1 opt2 opt3"
+# Normalize mount options from the option string in $1
+# Convert options like "-o opt1,opt2 -oopt3" to "opt1 opt2 opt3"
 _normalize_mount_options()
 {
-       echo $MOUNT_OPTIONS | sed -n 's/-o\s*\(\S*\)/\1/gp'| sed 's/,/ /g'
+       echo "$1" | sed -n 's/-o\s*\(\S*\)/\1/gp'| sed 's/,/ /g'
 }
 
-# skip test if MOUNT_OPTIONS contains the given strings
+# skip test if $1 contains the given strings in trailing arguments
 # Both dax and dax=always are excluded if dax or dax=always is passed
-_exclude_scratch_mount_option()
+_exclude_mount_option()
 {
-       local mnt_opts=$(_normalize_mount_options)
+       local mnt_opts=$(_normalize_mount_options "$1")
 
+       shift
        while [ $# -gt 0 ]; do
                local pattern=$1
                echo "$pattern" | egrep -q "dax(=always|$)" && \
@@ -3877,6 +3895,16 @@ _exclude_scratch_mount_option()
        done
 }
 
+_exclude_scratch_mount_option()
+{
+       _exclude_mount_option "$MOUNT_OPTIONS" $@
+}
+
+_exclude_test_mount_option()
+{
+       _exclude_mount_option "$TEST_FS_MOUNT_OPTS" $@
+}
+
 _require_atime()
 {
        _exclude_scratch_mount_option "noatime"
@@ -4698,13 +4726,22 @@ _check_xfs_scrub_does_unicode() {
 
        _supports_xfs_scrub "${mount}" "${dev}" || return 1
 
-       # We only care if xfs_scrub has unicode string support...
-       if ! type ldd > /dev/null 2>&1 || \
-          ! ldd "${XFS_SCRUB_PROG}" | grep -q libicui18n; then
-               return 1
+       # If the xfs_scrub binary contains the string "Unicode name.*%s", then
+       # we know that it has the ability to complain about improper Unicode
+       # names.
+       if strings "${XFS_SCRUB_PROG}" | grep -q 'Unicode name.*%s'; then
+               return 0
        fi
 
-       return 0
+       # If the xfs_scrub binary is linked against the libicui18n Unicode
+       # library, then we surmise that it contains the Unicode name checker.
+       if type ldd > /dev/null 2>&1 && \
+          ldd "${XFS_SCRUB_PROG}" 2> /dev/null | grep -q libicui18n; then
+               return 0
+       fi
+
+       # We could not establish that xfs_scrub supports unicode names.
+       return 1
 }
 
 # exfat timestamps start at 1980 and cannot be prior to epoch