From patchwork Mon Feb 22 04:26:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Theodore Ts'o X-Patchwork-Id: 8371611 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 07EFB9F2F0 for ; Mon, 22 Feb 2016 04:26:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D8ECC203E6 for ; Mon, 22 Feb 2016 04:26:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 34562203C0 for ; Mon, 22 Feb 2016 04:26:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753163AbcBVE0V (ORCPT ); Sun, 21 Feb 2016 23:26:21 -0500 Received: from imap.thunk.org ([74.207.234.97]:34164 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752593AbcBVE0U (ORCPT ); Sun, 21 Feb 2016 23:26:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=thunk.org; s=ef5046eb; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=mPsN9T+oJ4hZUDvwRRSlpV2KS/2jdHRPGgMQNLQNlkA=; b=wDEzR8E6f2L2NEDgMUzIxMLxtqybzLMnhXG/Vc5b4ZPQB32tziRB0BC1I9kDvp8w5NUnkbuWudUZ5eSFX3mp9Mz6kG2rddpgKotetlfN2X+dPLc7wf6IRVLRGx5EJHUvSvCI+hyWKG/gmm3FT4NooWMbP+W5uUTG3sAhqyCGLRQ=; Received: from root (helo=closure.thunk.org) by imap.thunk.org with local-esmtp (Exim 4.84) (envelope-from ) id 1aXi4h-0000LW-Ep; Mon, 22 Feb 2016 04:26:19 +0000 Received: by closure.thunk.org (Postfix, from userid 15806) id 94A1582E0CE; Sun, 21 Feb 2016 23:26:13 -0500 (EST) From: Theodore Ts'o To: fstests@vger.kernel.org Cc: Theodore Ts'o Subject: [PATCH 4/4] common: filter warning messages from mkfs.ext4 Date: Sun, 21 Feb 2016 23:26:11 -0500 Message-Id: <1456115171-13191-5-git-send-email-tytso@mit.edu> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456115171-13191-1-git-send-email-tytso@mit.edu> References: <1456115171-13191-1-git-send-email-tytso@mit.edu> X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: tytso@thunk.org X-SA-Exim-Scanned: No (on imap.thunk.org); SAEximRunCond expanded to false Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Commit 4a5cda8102828 ("xfstests: do not unmount tmpfs during remount") changed generic/135 to no longer redirect stderr to /dev/null when running _scratch_mkfs. This caused ext4 using a 1k block size to fail when running this test because mkfs.ext4 would issue a warning message about the use of a non-block size that wasn't expected by golden output for the test. Fix this by filtering out warning messages in _scratch_mkfs_ext4. Signed-off-by: Theodore Ts'o Reviewed-by: Christoph Hellwig --- common/rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/rc b/common/rc index f07b274..5fb3282 100644 --- a/common/rc +++ b/common/rc @@ -655,7 +655,7 @@ _scratch_mkfs_ext4() fi # output stored mkfs output - cat $tmp_dir.mkfserr >&2 + grep -v ^Warning: $tmp_dir.mkfserr >&2 cat $tmp_dir.mkfsstd rm -f $tmp_dir.mkfserr $tmp_dir.mkfsstd