From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:7130 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750752AbaIBOWo (ORCPT ); Tue, 2 Sep 2014 10:22:44 -0400 From: Brian Foster Subject: [PATCH 1/2] xfstests/common: don't assume sysfs attrs all reside under test dev Date: Tue, 2 Sep 2014 10:22:40 -0400 Message-Id: <1409667761-50248-2-git-send-email-bfoster@redhat.com> In-Reply-To: <1409667761-50248-1-git-send-email-bfoster@redhat.com> References: <1409667761-50248-1-git-send-email-bfoster@redhat.com> Sender: fstests-owner@vger.kernel.org To: fstests@vger.kernel.org Cc: xfs@oss.sgi.com List-ID: _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 --- common/rc | 3 +-- tests/xfs/011 | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/common/rc b/common/rc index 16da898..01f573e 100644 --- a/common/rc +++ b/common/rc @@ -1224,13 +1224,12 @@ _require_xfs_sysfs() { attr=$1 sysfsdir=/sys/fs/xfs - testdev=`_short_dev $TEST_DEV` if [ ! -e $sysfsdir ]; then _notrun "no kernel support for XFS sysfs attributes" fi - if [ ! -z $1 ] && [ ! -e $sysfsdir/$testdev/$attr ]; then + if [ ! -z $1 ] && [ ! -e $sysfsdir/$attr ]; then _notrun "sysfs attribute '$attr' is not supported" fi } diff --git a/tests/xfs/011 b/tests/xfs/011 index 658a822..197752c 100755 --- a/tests/xfs/011 +++ b/tests/xfs/011 @@ -85,7 +85,7 @@ _supported_os Linux _require_scratch _require_freeze -_require_xfs_sysfs log +_require_xfs_sysfs $(_short_dev $TEST_DEV)/log rm -f $seqres.full -- 1.8.3.1