From patchwork Thu Mar 30 15:06:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sterba X-Patchwork-Id: 9654409 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DD99A602BD for ; Thu, 30 Mar 2017 15:13:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D04552852B for ; Thu, 30 Mar 2017 15:13:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C54332854F; Thu, 30 Mar 2017 15:13:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3EE142852B for ; Thu, 30 Mar 2017 15:13:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933206AbdC3PNE (ORCPT ); Thu, 30 Mar 2017 11:13:04 -0400 Received: from mx2.suse.de ([195.135.220.15]:56112 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933187AbdC3PNE (ORCPT ); Thu, 30 Mar 2017 11:13:04 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 16046AD0D for ; Thu, 30 Mar 2017 15:13:02 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id 9CAD0DA8FD; Thu, 30 Mar 2017 17:12:19 +0200 (CEST) From: David Sterba To: fstests@vger.kernel.org Cc: David Sterba Subject: [PATCH] btrfs: use full subcommand names Date: Thu, 30 Mar 2017 17:06:33 +0200 Message-Id: <20170330150633.14962-1-dsterba@suse.com> X-Mailer: git-send-email 2.12.0 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Update the remaining calls to 'btrfs' that use shortened command names. Use of full names is recommended to avoid any ambiguities. Signed-off-by: David Sterba --- tests/btrfs/027 | 2 +- tests/btrfs/085 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/btrfs/027 b/tests/btrfs/027 index 46970a2918a7..2c8b458e5ff4 100755 --- a/tests/btrfs/027 +++ b/tests/btrfs/027 @@ -78,7 +78,7 @@ run_test() _scratch_mount >>$seqres.full 2>&1 local missing_dev=`echo $SCRATCH_DEV_POOL | awk '{print $2}'` - local missing_dev_id=`$BTRFS_UTIL_PROG fi show $SCRATCH_MNT | grep $missing_dev | awk '{print $2}'` + local missing_dev_id=`$BTRFS_UTIL_PROG filesystem show $SCRATCH_MNT | grep $missing_dev | awk '{print $2}'` # get some data on the filesystem so there's something to replace _ddt of="$SCRATCH_MNT"/file1 bs=1M count=1 >> $seqres.full 2>&1 diff --git a/tests/btrfs/085 b/tests/btrfs/085 index 3dbc67f5d40b..804899724cba 100755 --- a/tests/btrfs/085 +++ b/tests/btrfs/085 @@ -134,14 +134,14 @@ test_orphan() new_subvolume() { - _run_btrfs_util_prog subvol create $SCRATCH_MNT/testdir + _run_btrfs_util_prog subvolume create $SCRATCH_MNT/testdir } new_default() { new_subvolume - SUB=$($BTRFS_UTIL_PROG subvol list $SCRATCH_MNT |awk '{print $2}') - _run_btrfs_util_prog subvol set-default $SUB $SCRATCH_MNT + SUB=$($BTRFS_UTIL_PROG subvolume list $SCRATCH_MNT |awk '{print $2}') + _run_btrfs_util_prog subvolume set-default $SUB $SCRATCH_MNT _unmount_flakey _mount_flakey