From patchwork Tue Nov 27 21:43:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwendal Grignou X-Patchwork-Id: 10701529 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 11124109C for ; Tue, 27 Nov 2018 21:43:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 01B112B013 for ; Tue, 27 Nov 2018 21:43:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E9C672A1A7; Tue, 27 Nov 2018 21:43:35 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 948D028A06 for ; Tue, 27 Nov 2018 21:43:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726368AbeK1Imu (ORCPT ); Wed, 28 Nov 2018 03:42:50 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:40113 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726286AbeK1Imu (ORCPT ); Wed, 28 Nov 2018 03:42:50 -0500 Received: by mail-pg1-f194.google.com with SMTP id z10so8459468pgp.7 for ; Tue, 27 Nov 2018 13:43:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=r7TUI6Jsk4qmaK0huIAEEjl9pS7jSWSmxo16DzENEtM=; b=d419xMuHrOmFN0iwm/9LwSLRTBke2McjUn/sbziIRlfqEbFJOuHU3CoCBs5Vk0YEiX Ad9il2jfVfZCch9uayHXgVIh4gtoYmqHCKFDYLCMSw99Vs8QmxH85Nwt0qMD9TaInFEO RbAINnO4TRxSXP7LXAaeNNmvc7SzseDQc0Rhk1nIJ9eIBFLngjBiv+rtfybuHbWSa/qH hix/iAeFcOtR15lmGWVQqdNayT5mmPUlNVEpVCT01BCBQoSyC0KarPcmMkUIy3CYjOzv 1zu6TAKyx9g+qhjWhKQufw3PIfU5CV9fO9fLkvQGYCn8jifvsU1HaWsdKEbndd5MIQMf DEPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=r7TUI6Jsk4qmaK0huIAEEjl9pS7jSWSmxo16DzENEtM=; b=FNRVKQGU/lyhfaJeOzSjx17+VB5NqJ2zawVA+xKD5SU87YXCVJnTWTwsdSdPjFqxAq aUwfL5NSqdDNmFgpIZcH5MZynAnitF7BFmwy6SsLENOU3pPXDI891KlyuzTjOLDngMFK HvMVVRZBdQu1XMMD59M5SVQbmNv2/BJ5idrvdfExNtkWz2DXHXpkCwsb74F2KvDAyXpZ 84KLrtByR+OaTOlv8yPf8NxgI8B0cPw2tFqP75C1cZdhp0FlLg02fxQDxs5Moc2gcYIB 7kcQ+RB3bWdlvLAq/bG4G9ceYUSENYoEK5nuuKfMSLnlClphh+2oGLJgG4NcdV7MrFS9 Mt+Q== X-Gm-Message-State: AA+aEWZgY9jeApNj2A09Ugm4VfvQ/y9OnbbJcftZ9zaIq7rA27KrySh9 n7Szc9CS4oljwg+lFCs6fMCWVg== X-Google-Smtp-Source: AFSGD/WyE9RQIY1krBikPFLjvL0bmoDjkxwIrnHHth2aOGpMS/Xqvca64Wf+BZtyVN1NlH/YA7OfsQ== X-Received: by 2002:a63:89c2:: with SMTP id v185mr28576390pgd.97.1543355014058; Tue, 27 Nov 2018 13:43:34 -0800 (PST) Received: from gwendal.mtv.corp.google.com ([2620:15c:202:1:3c8f:512b:3522:dfaf]) by smtp.gmail.com with ESMTPSA id c13sm8824701pfe.93.2018.11.27.13.43.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Nov 2018 13:43:33 -0800 (PST) From: Gwendal Grignou To: guaneryu@gmail.com Cc: fstests@vger.kernel.org Subject: [PATCH 2/3] ext4: 032: fail nicely if the test partition is not big enough for the test Date: Tue, 27 Nov 2018 13:43:07 -0800 Message-Id: <20181127214308.137410-3-gwendal@chromium.org> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20181127214308.137410-1-gwendal@chromium.org> References: <20181127214308.137410-1-gwendal@chromium.org> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Gwendal Grignou --- tests/ext4/032 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/ext4/032 b/tests/ext4/032 index 8534ddd6..7d8c6da7 100755 --- a/tests/ext4/032 +++ b/tests/ext4/032 @@ -35,12 +35,21 @@ ext4_online_resize() local original_size=$1 local final_size=$2 local check_if_supported=${3:-0} + local avail=`df -P $SCRATCH_DIR | awk 'END {print $4}'` + local requested=$(($final_size * $BLK_SIZ)) + + if [ $avail -lt $requested ]; then + echo "+++ not enough space on $SCRATCH_DIR: " \ + "requested $requested only $avail left" | \ + tee -a $seqres.full + _notrun "incomplete test due to storage space constraint" + fi ## Start with a clean image file. echo "" > ${IMG_FILE} echo "+++ truncate image file to $final_size" | \ tee -a $seqres.full - $XFS_IO_PROG -f -c "truncate $(($final_size * $BLK_SIZ))" ${IMG_FILE} + $XFS_IO_PROG -f -c "truncate $requested" ${IMG_FILE} LOOP_DEVICE=`_create_loop_device $IMG_FILE` echo "+++ create fs on image file $original_size" | \