mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
xfstests/common: don't assume sysfs attrs all reside under test dev
_require_xfs_sysfs() currently assumes that all sysfs attributes reside under a device-specific subdirectory in the XFS sysfs hierarchy. It is hardcoded to use the TEST_DEV mount and expect the relative attribute path as a parameter. Not all sysfs attributes are associated with specific devices or mount points, however. Remove the hardcoded device name part of the attribute path from _require_xfs_sysfs() and let the caller construct the relative path based on the sysfs XFS root directory. Signed-off-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
committed by
Dave Chinner
parent
1a2858960b
commit
7746b99a52
@@ -1302,13 +1302,12 @@ _require_xfs_sysfs()
|
|||||||
{
|
{
|
||||||
attr=$1
|
attr=$1
|
||||||
sysfsdir=/sys/fs/xfs
|
sysfsdir=/sys/fs/xfs
|
||||||
testdev=`_short_dev $TEST_DEV`
|
|
||||||
|
|
||||||
if [ ! -e $sysfsdir ]; then
|
if [ ! -e $sysfsdir ]; then
|
||||||
_notrun "no kernel support for XFS sysfs attributes"
|
_notrun "no kernel support for XFS sysfs attributes"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -z $1 ] && [ ! -e $sysfsdir/$testdev/$attr ]; then
|
if [ ! -z $1 ] && [ ! -e $sysfsdir/$attr ]; then
|
||||||
_notrun "sysfs attribute '$attr' is not supported"
|
_notrun "sysfs attribute '$attr' is not supported"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -85,7 +85,7 @@ _supported_os Linux
|
|||||||
|
|
||||||
_require_scratch
|
_require_scratch
|
||||||
_require_freeze
|
_require_freeze
|
||||||
_require_xfs_sysfs log
|
_require_xfs_sysfs $(_short_dev $TEST_DEV)/log
|
||||||
|
|
||||||
rm -f $seqres.full
|
rm -f $seqres.full
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user