From patchwork Sun Feb 5 06:53:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Theodore Ts'o X-Patchwork-Id: 9555915 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 BE8BE602B1 for ; Sun, 5 Feb 2017 06:53:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E1C227165 for ; Sun, 5 Feb 2017 06:53:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 80A6E275A2; Sun, 5 Feb 2017 06:53:48 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 E84D627165 for ; Sun, 5 Feb 2017 06:53:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751710AbdBEGxr (ORCPT ); Sun, 5 Feb 2017 01:53:47 -0500 Received: from imap.thunk.org ([74.207.234.97]:33742 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751735AbdBEGxq (ORCPT ); Sun, 5 Feb 2017 01:53:46 -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=KqPMAsdMm8bEnit1/ja38pRUv9xDwo2JYU3Ea1siUlk=; b=fPHl5MULqsYYb7n2WQQMv4pQSiCovdJjv5b9o4swH7UjxFG2ygKtIJ1vzSptCCEtJHgaZBZNbdqQAB7D9ZZqIDaSsa9wQP2loVffjNc/xwv2/qQjhaMgX8+ZiXEw2ZjMNfR55uve3cFeyJzlThUIZtSkJb+qLA6cufLyeTeMfpg=; Received: from root (helo=callcc.thunk.org) by imap.thunk.org with local-esmtp (Exim 4.84_2) (envelope-from ) id 1caGhi-00014x-Nk; Sun, 05 Feb 2017 06:53:42 +0000 Received: by callcc.thunk.org (Postfix, from userid 15806) id 2A338C00833; Sun, 5 Feb 2017 01:53:41 -0500 (EST) From: Theodore Ts'o To: fstests@vger.kernel.org Cc: Theodore Ts'o Subject: [PATCH 3/3] generic: filter out lost+found when running "ls $SCRATCH_MNT" Date: Sun, 5 Feb 2017 01:53:36 -0500 Message-Id: <20170205065336.14994-3-tytso@mit.edu> X-Mailer: git-send-email 2.11.0.rc0.7.gbe5a750 In-Reply-To: <20170205065336.14994-1-tytso@mit.edu> References: <20170205065336.14994-1-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-Virus-Scanned: ClamAV using ClamSMTP The generic/052 and generic/054 tests run ls on the root directory, and on ext4 we have a lost+found directory which is not in the golden output. Signed-off-by: Theodore Ts'o --- common/filter | 5 +++++ tests/generic/052 | 2 +- tests/generic/054 | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/common/filter b/common/filter index e39ac0e2..43281599 100644 --- a/common/filter +++ b/common/filter @@ -401,5 +401,10 @@ _filter_mknod() sed -e "s/mknod: [\`']\(.*\)': File exists/mknod: \1: File exists/" } +_filter_lostfound() +{ + sed -e '/^lost+found$/d' +} + # make sure this script returns success /bin/true diff --git a/tests/generic/052 b/tests/generic/052 index 74cf5b62..f7cdd09c 100755 --- a/tests/generic/052 +++ b/tests/generic/052 @@ -82,7 +82,7 @@ _scratch_mount $mnt >>$seqres.full 2>&1 \ || _fail "mount failed: $mnt $MOUNT_OPTIONS" echo "ls SCRATCH_MNT" -ls $SCRATCH_MNT +ls $SCRATCH_MNT | _filter_lostfound echo "unmount" _scratch_unmount diff --git a/tests/generic/054 b/tests/generic/054 index 238741c1..8375e574 100755 --- a/tests/generic/054 +++ b/tests/generic/054 @@ -102,7 +102,7 @@ for s in sync nosync ; do # check before on what FS should look like _echofull "ls SCRATCH_MNT" - ls $SCRATCH_MNT + ls $SCRATCH_MNT | _filter_lostfound _echofull "godown" src/godown -v -f $SCRATCH_MNT >> $seqres.full @@ -120,7 +120,7 @@ for s in sync nosync ; do # check on what FS looks like after log recovery _echofull "ls SCRATCH_MNT" - ls $SCRATCH_MNT + ls $SCRATCH_MNT | _filter_lostfound _echofull "unmount" _scratch_unmount