From patchwork Wed Dec 10 00:14:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Disseldorp X-Patchwork-Id: 5465891 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 84F11BEEA8 for ; Wed, 10 Dec 2014 00:14:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B97F520107 for ; Wed, 10 Dec 2014 00:14:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C881620103 for ; Wed, 10 Dec 2014 00:14:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752463AbaLJAO5 (ORCPT ); Tue, 9 Dec 2014 19:14:57 -0500 Received: from cantor2.suse.de ([195.135.220.15]:58770 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752429AbaLJAO4 (ORCPT ); Tue, 9 Dec 2014 19:14:56 -0500 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 48239AB09; Wed, 10 Dec 2014 00:14:55 +0000 (UTC) From: David Disseldorp To: fstests@vger.kernel.org Cc: linux-cifs@vger.kernel.org, David Disseldorp Subject: [PATCH 1/2] common: rename _require_btrfs_cloner to _require_cloner Date: Wed, 10 Dec 2014 01:14:44 +0100 Message-Id: <1418170485-3732-1-git-send-email-ddiss@suse.de> X-Mailer: git-send-email 2.1.2 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 src/cloner.c is no longer Btrfs specific, so use a generic name. Signed-off-by: David Disseldorp Acked-by: Steve French --- common/rc | 2 +- tests/btrfs/035 | 2 +- tests/btrfs/052 | 2 +- tests/btrfs/055 | 2 +- tests/btrfs/056 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/rc b/common/rc index d5e3aff..ea80c77 100644 --- a/common/rc +++ b/common/rc @@ -2367,7 +2367,7 @@ _require_fssum() [ -x $FSSUM_PROG ] || _notrun "fssum not built" } -_require_btrfs_cloner() +_require_cloner() { CLONER_PROG=$here/src/cloner [ -x $CLONER_PROG ] || \ diff --git a/tests/btrfs/035 b/tests/btrfs/035 index dd303af..35ddfce 100755 --- a/tests/btrfs/035 +++ b/tests/btrfs/035 @@ -45,7 +45,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15 _supported_fs btrfs _supported_os Linux _require_scratch -_require_btrfs_cloner +_require_cloner _scratch_mkfs > /dev/null 2>&1 _scratch_mount diff --git a/tests/btrfs/052 b/tests/btrfs/052 index 671034e..c75193d 100755 --- a/tests/btrfs/052 +++ b/tests/btrfs/052 @@ -44,7 +44,7 @@ _cleanup() _supported_fs btrfs _supported_os Linux _require_scratch -_require_btrfs_cloner +_require_cloner _need_to_be_root rm -f $seqres.full diff --git a/tests/btrfs/055 b/tests/btrfs/055 index 10c6040..c0dd9ed 100755 --- a/tests/btrfs/055 +++ b/tests/btrfs/055 @@ -48,7 +48,7 @@ _cleanup() _supported_fs btrfs _supported_os Linux _require_scratch -_require_btrfs_cloner +_require_cloner _require_btrfs_fs_feature "no_holes" _require_btrfs_mkfs_feature "no-holes" _need_to_be_root diff --git a/tests/btrfs/056 b/tests/btrfs/056 index 9ecfeb8..9e9d92b 100755 --- a/tests/btrfs/056 +++ b/tests/btrfs/056 @@ -52,7 +52,7 @@ _cleanup() _supported_fs btrfs _supported_os Linux _require_scratch -_require_btrfs_cloner +_require_cloner _require_btrfs_fs_feature "no_holes" _require_btrfs_mkfs_feature "no-holes" _require_dm_flakey