From patchwork Tue Dec 18 20:35:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10736253 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D6E1E14E2 for ; Tue, 18 Dec 2018 20:35:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C6C802AE1D for ; Tue, 18 Dec 2018 20:35:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BAD962AE25; Tue, 18 Dec 2018 20:35:56 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY 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 658912AE1D for ; Tue, 18 Dec 2018 20:35:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727249AbeLRUfz (ORCPT ); Tue, 18 Dec 2018 15:35:55 -0500 Received: from aserp2130.oracle.com ([141.146.126.79]:55296 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726638AbeLRUfz (ORCPT ); Tue, 18 Dec 2018 15:35:55 -0500 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id wBIKZ3ws100523; Tue, 18 Dec 2018 20:35:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2018-07-02; bh=+cx++bt0VP66r0zNo6YZGQ1TSG6H74Uxf2xokzyH7pE=; b=lZl9AV+QLltgIfBSNyVv84wD1jRkZuyB76+ImQzkWbJtWghL9UiKXh2RYWGIYvBHNOXP Gs8HP8YWZW8yfTjkmjPppwFKomp90Al8F/6CI3pF2F8XbdLMDJjnLflPWW4tMDkP71Wh eqRVIxbeg99usm6ntmR/gYyRUdNvGNhPv9w7OCec0X7H7L2fAKQ7PHmgIrZlql9v3IjE U9jPa3Z0JhgLVh0vyLy061p8mw5SInjIJY34+Ej+KMq8ToWnYY2xofdBgwNypKIOMgHm w5R0NbgaPztrrm5iOn4JpkT4Rj4OqjIrDDh+NFKkCJsOvoplbuOVS8tBH8mkZ0m8gEuy 4A== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp2130.oracle.com with ESMTP id 2pcq4dwwcu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 18 Dec 2018 20:35:52 +0000 Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id wBIKZpvt008913 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 18 Dec 2018 20:35:52 GMT Received: from abhmp0005.oracle.com (abhmp0005.oracle.com [141.146.116.11]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id wBIKZpeP016002; Tue, 18 Dec 2018 20:35:51 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 18 Dec 2018 12:35:51 -0800 Subject: [PATCH 1/5] xfs/111: fix golden output From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Tue, 18 Dec 2018 12:35:50 -0800 Message-ID: <154516535027.31115.4827015654233888092.stgit@magnolia> In-Reply-To: <154516534392.31115.7010578395334646479.stgit@magnolia> References: <154516534392.31115.7010578395334646479.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9111 signatures=668680 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1812180170 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong In commit f4eee5126, this test was changed to run xfs_fsr to bulkstat its way through the filesystem until it finds the corrupt inode. The golden output was changed to capture xfs_fsr's output, but neglects the fact that when fsr's output is not a tty, all the status and error messages are sent to syslog, not stdout. Therefore, this test consistently fails because it expects output of "$SCRATCH_MNT start inode=0" but this never appears. Signed-off-by: Darrick J. Wong --- tests/xfs/111 | 2 +- tests/xfs/111.out | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/xfs/111 b/tests/xfs/111 index 2ef69f07..965eb625 100755 --- a/tests/xfs/111 +++ b/tests/xfs/111 @@ -58,7 +58,7 @@ _try_scratch_mount || _fail "Couldn't mount after itrash" echo Attempting bulkstat #src/bstat -q $SCRATCH_MNT -$XFS_FSR_PROG $SCRATCH_MNT | _filter_scratch +$XFS_FSR_PROG -g $SCRATCH_MNT | _filter_scratch # Fix up intentional corruption so test can pass _scratch_unmount diff --git a/tests/xfs/111.out b/tests/xfs/111.out index fd56c3c8..41fa48f8 100644 --- a/tests/xfs/111.out +++ b/tests/xfs/111.out @@ -10,4 +10,3 @@ Blat inode clusters Starting overwrite Overwrite complete Attempting bulkstat -SCRATCH_MNT start inode=0