From patchwork Tue Oct 3 08:21:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Chinner X-Patchwork-Id: 9981909 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 CAE4C60375 for ; Tue, 3 Oct 2017 08:21:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AFEB72884F for ; Tue, 3 Oct 2017 08:21:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A35B728854; Tue, 3 Oct 2017 08:21:38 +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 481972884F for ; Tue, 3 Oct 2017 08:21:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751135AbdJCIVh (ORCPT ); Tue, 3 Oct 2017 04:21:37 -0400 Received: from ipmail07.adl2.internode.on.net ([150.101.137.131]:37481 "EHLO ipmail07.adl2.internode.on.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751111AbdJCIVh (ORCPT ); Tue, 3 Oct 2017 04:21:37 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2D7AQB+R9NZ//yBpztdGgEBAQECAQEBAQgBAQEBhS8njwyPNQaBK40eiyCFPwICAQEChR4BAgEBAQEBAmsohRkGOhwjEAgYDCUPBSUDIROKIwynYosyAQEBBwIBJSGDDIMLkFIFoTKUWIIhkHWKE4x6V4EOMiEIHRWHeiw2iVQBAQE Received: from ppp59-167-129-252.static.internode.on.net (HELO dastard) ([59.167.129.252]) by ipmail07.adl2.internode.on.net with ESMTP; 03 Oct 2017 18:51:35 +1030 Received: from dave by dastard with local (Exim 4.80) (envelope-from ) id 1dzISM-0002LD-BT; Tue, 03 Oct 2017 19:21:34 +1100 Date: Tue, 3 Oct 2017 19:21:34 +1100 From: Dave Chinner To: Eric Sandeen Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Subject: fstests: update mkfs.xfs filters for new refactoring Message-ID: <20171003082134.GJ3666@dastard> References: <20171003080607.GM15067@dastard> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20171003080607.GM15067@dastard> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP fstests: update mkfs.xfs filters for new refactoring From: Dave Chinner The new mkfs code adds some output to indicate where the defaults were sourced from, so filter that out so it doesn't contaminate tests unnecessarily. Signed-Off-By: Dave Chinner --- common/xfs | 3 ++- tests/xfs/206 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/common/xfs b/common/xfs index def28bfc7309..603792092060 100644 --- a/common/xfs +++ b/common/xfs @@ -81,7 +81,8 @@ _scratch_mkfs_xfs() { local mkfs_cmd="`_scratch_mkfs_xfs_opts`" local mkfs_filter="sed -e '/less than device physical sector/d' \ - -e '/switching to logical sector/d'" + -e '/switching to logical sector/d' \ + -e '/Default configuration/d'" local tmp=`mktemp -u` local mkfs_status diff --git a/tests/xfs/206 b/tests/xfs/206 index 70997e3fe83e..01782b7b93a9 100755 --- a/tests/xfs/206 +++ b/tests/xfs/206 @@ -84,7 +84,8 @@ mkfs_filter() -e "s/\(sectsz\)\(=[0-9]* *\)/\1=512 /" \ -e "s/\(sunit=\)\([0-9]* blks,\)/\10 blks,/" \ -e "s/, lazy-count=[0-9]//" \ - -e "/.*crc=/d" + -e "/.*crc=/d" \ + -e "/^Default configuration/d" } # mkfs slightly smaller than that, small log for speed.