From patchwork Thu Jun 21 07:04:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lu Fengqi X-Patchwork-Id: 10479281 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 B35AD60532 for ; Thu, 21 Jun 2018 07:05:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A4B3C28E44 for ; Thu, 21 Jun 2018 07:05:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A334F28E7F; Thu, 21 Jun 2018 07:05:32 +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=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, 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 23C0928EC3 for ; Thu, 21 Jun 2018 07:04:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751132AbeFUHEj (ORCPT ); Thu, 21 Jun 2018 03:04:39 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:14002 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750981AbeFUHEi (ORCPT ); Thu, 21 Jun 2018 03:04:38 -0400 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="41337492" Received: from localhost (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 21 Jun 2018 15:04:36 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id 59D734B314A9; Thu, 21 Jun 2018 15:04:34 +0800 (CST) Received: from fnst.localdomain (10.167.226.155) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.399.0; Thu, 21 Jun 2018 15:04:40 +0800 From: Lu Fengqi To: , Subject: [PATCH] fstests: btrfs/085: replace btrfs-debug-tree with btrfs inspect-internal dump-tree Date: Thu, 21 Jun 2018 15:04:22 +0800 Message-ID: <20180621070422.25236-1-lufq.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [10.167.226.155] X-yoursite-MailScanner-ID: 59D734B314A9.AC7F3 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: lufq.fnst@cn.fujitsu.com Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since btrfs-dump-tree has been removed from btrfs-progs, use btrfs inspect-internal dump-tree instead of btrfs-dump-tree. Signed-off-by: Lu Fengqi Reviewed-by: Nikolay Borisov --- tests/btrfs/085 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/btrfs/085 b/tests/btrfs/085 index 8cc69c21c0dd..4773ed8041fd 100755 --- a/tests/btrfs/085 +++ b/tests/btrfs/085 @@ -39,14 +39,14 @@ _supported_fs btrfs _supported_os Linux _require_scratch _require_dm_target flakey -_require_command "$BTRFS_DEBUG_TREE_PROG" btrfs-debug-tree +_require_btrfs_command inspect-internal dump-tree rm -f $seqres.full has_orphan_item() { INO=$1 - if $BTRFS_DEBUG_TREE_PROG $SCRATCH_DEV | \ + if $BTRFS_UTIL_PROG inspect-internal dump-tree $SCRATCH_DEV | \ grep -q "key (ORPHAN ORPHAN_ITEM $INO)"; then return 0 fi