From patchwork Wed Dec 13 06:04:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10109257 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 9791E60327 for ; Wed, 13 Dec 2017 06:09:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8787E2891A for ; Wed, 13 Dec 2017 06:09:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7ACB028AA2; Wed, 13 Dec 2017 06:09:26 +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, 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 9C9652891A for ; Wed, 13 Dec 2017 06:09:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750795AbdLMGJY (ORCPT ); Wed, 13 Dec 2017 01:09:24 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:47338 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750751AbdLMGJX (ORCPT ); Wed, 13 Dec 2017 01:09:23 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.21/8.16.0.21) with SMTP id vBD67LQ5156969; Wed, 13 Dec 2017 06:09:21 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-2017-10-26; bh=toU6CElhOQ33d+spc0NDcj83AV0GM1uy/AMMhaJLaLc=; b=NS9cgstpvDCa5skPljpDbdAdut8f0NeCMxGfE9TXNGPJTJ+rNI084xKy+0iPkFnNQMqF WszU0nbDqaUQPVfQV6f9jhtQ8qlRpNcE6jmMu0ZOKxobieauUYQZ0DicWcj5X2SPo7KE CFlx9QFb3YI02tPeYeCLgE8kEtxGe5tCYW4TGBbiCjb9maxJqpV3NNiG7iTLxuI4jxw1 PLXP/K7qTXZVhnfY76BRqdr63ti0fw2jNN8+z3poPoBq2ZsiDDm1kzsoIvYdPl4zpAPq oDEDnHZR82Uf6Giffu1tzFQvBPIZPPFuLqgA5NpGWXXjzY9+zWPZcYM3CAx4UHk+X7Ga 2A== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2120.oracle.com with ESMTP id 2etxdj04h0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Dec 2017 06:09:20 +0000 Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id vBD64Jge014542 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Dec 2017 06:04:19 GMT Received: from abhmp0016.oracle.com (abhmp0016.oracle.com [141.146.116.22]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id vBD64J0v030956; Wed, 13 Dec 2017 06:04:19 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 12 Dec 2017 22:04:19 -0800 Subject: [PATCH 8/8] xfs/068: fix variability problems in file/dir count output From: "Darrick J. Wong" To: eguan@redhat.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Tue, 12 Dec 2017 22:04:11 -0800 Message-ID: <151314505158.18893.11894289091110903029.stgit@magnolia> In-Reply-To: <151314499003.18893.8687182548758898133.stgit@magnolia> References: <151314499003.18893.8687182548758898133.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8743 signatures=668646 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=741 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1712130088 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 this test we use fsstress to create some number of files and then exercise xfsdump/xfsrestore on them. Depending on the fsstress config we may end up with a different number of files than is hardcoded in the golden output (particularly after adding reflink support to fsstress) and thereby fail the test. Since we're not really testing how many files fsstress can create, just turn the counts into XXX/YYY. Signed-off-by: Darrick J. Wong --- tests/xfs/068 | 4 +++- tests/xfs/068.out | 2 +- 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/tests/xfs/068 b/tests/xfs/068 index 7151e28..119b204 100755 --- a/tests/xfs/068 +++ b/tests/xfs/068 @@ -44,7 +44,9 @@ _supported_fs xfs _supported_os Linux _create_dumpdir_stress_num 4096 -_do_dump_restore +# Fancy filtering here because fsstress doesn't always create the +# same number of files (depending on the fs geometry) +_do_dump_restore | sed -e 's/xfsrestore: [0-9]* directories and [0-9]* entries/xfsrestore: XXX directories and YYY entries/g' # success, all done exit diff --git a/tests/xfs/068.out b/tests/xfs/068.out index fa3a552..f53c555 100644 --- a/tests/xfs/068.out +++ b/tests/xfs/068.out @@ -22,7 +22,7 @@ xfsrestore: session id: ID xfsrestore: media ID: ID xfsrestore: searching media for directory dump xfsrestore: reading directories -xfsrestore: 383 directories and 1335 entries processed +xfsrestore: XXX directories and YYY entries processed xfsrestore: directory post-processing xfsrestore: restoring non-directory files xfsrestore: restore complete: SECS seconds elapsed