From patchwork Tue Oct 28 13:16:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eryu Guan X-Patchwork-Id: 5176611 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EA0A89F318 for ; Tue, 28 Oct 2014 13:16:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 269E420219 for ; Tue, 28 Oct 2014 13:16:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4CBA2201F2 for ; Tue, 28 Oct 2014 13:16:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752462AbaJ1NQz (ORCPT ); Tue, 28 Oct 2014 09:16:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43522 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752143AbaJ1NQz (ORCPT ); Tue, 28 Oct 2014 09:16:55 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9SDGtdR022661 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 28 Oct 2014 09:16:55 -0400 Received: from localhost (dhcp-12-195.nay.redhat.com [10.66.12.195]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s9SDGrTu023449; Tue, 28 Oct 2014 09:16:54 -0400 From: Eryu Guan To: fstests@vger.kernel.org Cc: linux-nfs@vger.kernel.org, Eryu Guan Subject: [PATCH 2/4] common: add _require_block_device() helper Date: Tue, 28 Oct 2014 21:16:09 +0800 Message-Id: <1414502171-10319-3-git-send-email-eguan@redhat.com> In-Reply-To: <1414502171-10319-1-git-send-email-eguan@redhat.com> References: <1414502171-10319-1-git-send-email-eguan@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add _require_block_device() helper and use it in _require_dm_flakey() and generic/076. _require_dm_flakey() assumes $SCRATCH_DEV is a block device, now it can also be a NFS export. generic/076 does "cat $SCRATCH_DEV" which will fail when testing on NFS. Signed-off-by: Eryu Guan Reviewed-by: Christoph Hellwig --- common/rc | 15 +++++++++++++++ tests/generic/076 | 1 + 2 files changed, 16 insertions(+) diff --git a/common/rc b/common/rc index 8738da7..42f00cb 100644 --- a/common/rc +++ b/common/rc @@ -1237,10 +1237,25 @@ _require_command() [ -n "$1" -a -x "$1" ] || _notrun "$_cmd utility required, skipped this test" } +# this test requires the device to be valid block device +# $1 - device +_require_block_device() +{ + if [ -z "$1" ]; then + echo "Usage: _require_block_device " 1>&2 + exit 1 + fi + if [ "`_is_block_dev $SCRATCH_DEV`" == "" ]; then + _notrun "require $1 to be valid block disk" + fi +} + # this test requires the device mapper flakey target # _require_dm_flakey() { + # require SCRATCH_DEV to be a valid block device + _require_block_device $SCRATCH_DEV _require_command $DMSETUP_PROG modprobe dm-flakey >/dev/null 2>&1 diff --git a/tests/generic/076 b/tests/generic/076 index 02af762..aa0aae0 100755 --- a/tests/generic/076 +++ b/tests/generic/076 @@ -56,6 +56,7 @@ _supported_fs generic _supported_os IRIX Linux _require_scratch +_require_block_device $SCRATCH_DEV echo "*** init fs"