From patchwork Thu Sep 10 02:37:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 7150161 Return-Path: X-Original-To: patchwork-linux-btrfs@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 233B79F1D3 for ; Thu, 10 Sep 2015 02:41:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2D28320525 for ; Thu, 10 Sep 2015 02:41:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3266320524 for ; Thu, 10 Sep 2015 02:40:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753918AbbIJCjl (ORCPT ); Wed, 9 Sep 2015 22:39:41 -0400 Received: from cn.fujitsu.com ([59.151.112.132]:8090 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752666AbbIJCjl (ORCPT ); Wed, 9 Sep 2015 22:39:41 -0400 X-IronPort-AV: E=Sophos;i="5.15,520,1432569600"; d="scan'208";a="100544624" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 10 Sep 2015 10:42:36 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t8A2dQJX007933; Thu, 10 Sep 2015 10:39:26 +0800 Received: from localhost.localdomain (10.167.226.33) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Thu, 10 Sep 2015 10:39:38 +0800 From: Qu Wenruo To: CC: Subject: [PATCH v2 5/5] btrfs-progs: convert-test: Disable different nodesize test Date: Thu, 10 Sep 2015 10:37:38 +0800 Message-ID: <1441852658-11385-1-git-send-email-quwenruo@cn.fujitsu.com> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1441852458-10289-1-git-send-email-quwenruo@cn.fujitsu.com> References: <1441852458-10289-1-git-send-email-quwenruo@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.33] Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 As now btrfs-convert is forced to used mixed block group, only test pagesize as nodesize for convert. Signed-off-by: Qu Wenruo --- tests/convert-tests.sh | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/tests/convert-tests.sh b/tests/convert-tests.sh index 68c03dc..f6f4679 100755 --- a/tests/convert-tests.sh +++ b/tests/convert-tests.sh @@ -57,19 +57,25 @@ if ! [ -z "$TEST" ]; then fi for feature in '' 'extref' 'skinny-metadata' 'no-holes'; do - convert_test "$feature" "ext2 4k nodesize" 4096 mke2fs -b 4096 - convert_test "$feature" "ext3 4k nodesize" 4096 mke2fs -j -b 4096 - convert_test "$feature" "ext4 4k nodesize" 4096 mke2fs -t ext4 -b 4096 - convert_test "$feature" "ext2 8k nodesize" 8192 mke2fs -b 4096 - convert_test "$feature" "ext3 8k nodesize" 8192 mke2fs -j -b 4096 - convert_test "$feature" "ext4 8k nodesize" 8192 mke2fs -t ext4 -b 4096 - convert_test "$feature" "ext2 16k nodesize" 16384 mke2fs -b 4096 - convert_test "$feature" "ext3 16k nodesize" 16384 mke2fs -j -b 4096 - convert_test "$feature" "ext4 16k nodesize" 16384 mke2fs -t ext4 -b 4096 - convert_test "$feature" "ext2 32k nodesize" 32768 mke2fs -b 4096 - convert_test "$feature" "ext3 32k nodesize" 32768 mke2fs -j -b 4096 - convert_test "$feature" "ext4 32k nodesize" 32768 mke2fs -t ext4 -b 4096 - convert_test "$feature" "ext2 64k nodesize" 65536 mke2fs -b 4096 - convert_test "$feature" "ext3 64k nodesize" 65536 mke2fs -j -b 4096 - convert_test "$feature" "ext4 64k nodesize" 65536 mke2fs -t ext4 -b 4096 + # Btrfs-convert is forced to use mixed-bg, so must use pagesize + # for nodesize right now + nodesize=`getconf PAGESIZE` + convert_test "$feature" "ext2 4k nodesize" $nodesize mke2fs -b 4096 + convert_test "$feature" "ext3 4k nodesize" $nodesize mke2fs -b 4096 + convert_test "$feature" "ext4 4k nodesize" $nodesize mke2fs -b 4096 +# convert_test "$feature" "ext2 4k nodesize" 4096 mke2fs -b 4096 +# convert_test "$feature" "ext3 4k nodesize" 4096 mke2fs -j -b 4096 +# convert_test "$feature" "ext4 4k nodesize" 4096 mke2fs -t ext4 -b 4096 +# convert_test "$feature" "ext2 8k nodesize" 8192 mke2fs -b 4096 +# convert_test "$feature" "ext3 8k nodesize" 8192 mke2fs -j -b 4096 +# convert_test "$feature" "ext4 8k nodesize" 8192 mke2fs -t ext4 -b 4096 +# convert_test "$feature" "ext2 16k nodesize" 16384 mke2fs -b 4096 +# convert_test "$feature" "ext3 16k nodesize" 16384 mke2fs -j -b 4096 +# convert_test "$feature" "ext4 16k nodesize" 16384 mke2fs -t ext4 -b 4096 +# convert_test "$feature" "ext2 32k nodesize" 32768 mke2fs -b 4096 +# convert_test "$feature" "ext3 32k nodesize" 32768 mke2fs -j -b 4096 +# convert_test "$feature" "ext4 32k nodesize" 32768 mke2fs -t ext4 -b 4096 +# convert_test "$feature" "ext2 64k nodesize" 65536 mke2fs -b 4096 +# convert_test "$feature" "ext3 64k nodesize" 65536 mke2fs -j -b 4096 +# convert_test "$feature" "ext4 64k nodesize" 65536 mke2fs -t ext4 -b 4096 done