From patchwork Mon Jun 8 18:34:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ari Sundholm X-Patchwork-Id: 6567481 Return-Path: X-Original-To: patchwork-fstests@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 283049F3D1 for ; Mon, 8 Jun 2015 18:40:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4EBD820546 for ; Mon, 8 Jun 2015 18:40:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D526D20544 for ; Mon, 8 Jun 2015 18:40:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752524AbbFHSkH (ORCPT ); Mon, 8 Jun 2015 14:40:07 -0400 Received: from nebula-exfe-01.nebula.fi ([83.145.198.163]:26469 "EHLO ex10.nebula.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752946AbbFHSkG (ORCPT ); Mon, 8 Jun 2015 14:40:06 -0400 X-Greylist: delayed 327 seconds by postgrey-1.27 at vger.kernel.org; Mon, 08 Jun 2015 14:40:06 EDT Received: from [192.168.75.117] (194.100.106.190) by ex10.nebula.fi (83.145.198.163) with Microsoft SMTP Server (TLS) id 14.3.224.2; Mon, 8 Jun 2015 21:34:36 +0300 Message-ID: <1433788464.28321.9.camel@ari-macbook> Subject: [PATCH] common/punch, generic/273: Minor things for busybox support. From: Ari Sundholm To: Date: Mon, 8 Jun 2015 21:34:24 +0300 Organization: Tuxera Inc. X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-Originating-IP: [194.100.106.190] Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@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=unavailable 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 From: Ari Sundholm These changes make it possible to run more of the tests on busybox. Signed-off-by: Ari Sundholm --- common/punch | 4 ++-- tests/generic/273 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/punch b/common/punch index a75f4cf..7f268cd 100644 --- a/common/punch +++ b/common/punch @@ -203,7 +203,7 @@ _coalesce_extents() _filter_fiemap() { - awk --posix ' + awk ' $3 ~ /hole/ { print $1, $2, $3; next; @@ -223,7 +223,7 @@ _filter_fiemap() # it is an extent or a hole _filter_hole_fiemap() { - awk --posix ' + awk ' $3 ~ /hole/ { print $1, $2, $3; next; diff --git a/tests/generic/273 b/tests/generic/273 index 1ceb6c4..f15fcf2 100755 --- a/tests/generic/273 +++ b/tests/generic/273 @@ -68,7 +68,7 @@ _file_create() cd $SCRATCH_MNT/origin - _disksize=`$DF_PROG --block-size=1 $SCRATCH_DEV | tail -1 | awk '{ print $5 }'` + _disksize=`$DF_PROG -B 1 $SCRATCH_DEV | tail -1 | awk '{ print $5 }'` _disksize=$(($_disksize / 3)) _num=$(($_disksize / $count / $threads / 4096)) _count=$count