From patchwork Wed Dec 13 23:28:05 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: 10111119 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 E2C2F60352 for ; Wed, 13 Dec 2017 23:28:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D0B9D265B9 for ; Wed, 13 Dec 2017 23:28:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C57792972D; Wed, 13 Dec 2017 23:28:13 +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 5A7E1265B9 for ; Wed, 13 Dec 2017 23:28:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750749AbdLMX2M (ORCPT ); Wed, 13 Dec 2017 18:28:12 -0500 Received: from aserp2130.oracle.com ([141.146.126.79]:50120 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750745AbdLMX2M (ORCPT ); Wed, 13 Dec 2017 18:28:12 -0500 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.21/8.16.0.21) with SMTP id vBDNRQBd084919; Wed, 13 Dec 2017 23:28:10 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2017-10-26; bh=GoIGnwFmsOsP+bvEcCBYLzObHpaA8W6GsJM/j5/RAlU=; b=Ot2GKSqW/TFBu4Zd6uS9yeD9NFTLbqy/HVwUk4f78K8tw1cDyd8ivawx1dnZJNXScDK+ 7lpviJRTYb9zTq/TrxjoR8lV3ldiIRukzxZDgKa+SgH1Zcgv1pUECYeSD6QnxsCMKnB9 bLNn2BDtBWDLm25DCaLof2b782m/2n4xzqWBcDB8eMJsY16Bbe9n34QmzqoEkcSefNxq PJY/06sQN9Htz8WTiw6Gp0nywUrnRT5wLNrpf/9WqOcqXSzlU74hVDSJsB3pFnq+FCOf h70qdkxd3yOlSNqKPPG9iZaMOwSJe78ZJTON6CerX5pRAJ6xxcb/8SHUc0fjAtBhMNrl Fg== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp2130.oracle.com with ESMTP id 2eud9bg5hm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Dec 2017 23:28:10 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id vBDNS8EA016007 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Dec 2017 23:28:09 GMT Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id vBDNS8pW004576; Wed, 13 Dec 2017 23:28:08 GMT Received: from localhost (/10.145.179.124) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 13 Dec 2017 15:28:08 -0800 Date: Wed, 13 Dec 2017 15:28:05 -0800 From: "Darrick J. Wong" To: eguan@redhat.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH v2 8/8] xfs/068: fix clonerange problems in file/dir count output Message-ID: <20171213232805.GI6896@magnolia> References: <151314499003.18893.8687182548758898133.stgit@magnolia> <151314505158.18893.11894289091110903029.stgit@magnolia> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <151314505158.18893.11894289091110903029.stgit@magnolia> User-Agent: Mutt/1.5.24 (2015-08-30) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8744 signatures=668646 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=802 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1712130320 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 a fixed sequence of operations in fsstress to create some number of files and dirs and then exercise xfsdump/xfsrestore on them. Since clonerange/deduperange are not supported on all xfs configurations, detect if they're in fsstress and disable them so that we always execute exactly the same sequence of operations no matter how the filesystem is configured. Signed-off-by: Darrick J. Wong --- tests/xfs/068 | 8 ++++++++ 1 file changed, 8 insertions(+) -- 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..f95a539 100755 --- a/tests/xfs/068 +++ b/tests/xfs/068 @@ -43,6 +43,14 @@ trap "rm -rf $tmp.*; exit \$status" 0 1 2 3 15 _supported_fs xfs _supported_os Linux +# Remove fsstress commands that aren't supported on all xfs configs +if $FSSTRESS_PROG | grep -q clonerange; then + FSSTRESS_AVOID="-f clonerange=0 $FSSTRESS_AVOID" +fi +if $FSSTRESS_PROG | grep -q deduperange; then + FSSTRESS_AVOID="-f deduperange=0 $FSSTRESS_AVOID" +fi + _create_dumpdir_stress_num 4096 _do_dump_restore