From patchwork Mon Feb 22 04:26:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Theodore Ts'o X-Patchwork-Id: 8371631 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 396339FC85 for ; Mon, 22 Feb 2016 04:26:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 65BDD203AA for ; Mon, 22 Feb 2016 04:26:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC6B1203B0 for ; Mon, 22 Feb 2016 04:26:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753050AbcBVE0W (ORCPT ); Sun, 21 Feb 2016 23:26:22 -0500 Received: from imap.thunk.org ([74.207.234.97]:34166 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753072AbcBVE0U (ORCPT ); Sun, 21 Feb 2016 23:26:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=thunk.org; s=ef5046eb; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=Y+q2uRNVYS9MFxsMNmnrtg9Bxh76Sk2Y7potdKDT/Rk=; b=xwY/4B5PZFxudEPa8j0o68w4nmO3PRjIyyyw9sEgTVwFeRpuTRQdZQCqoL19UZUMAg3Yu1lj411YgQs5OzaufRF+8Y0wOuPeBcj97itW/oNcEclhAik/aGVdVDvWGk0BN/+KB72ic/ytyJiYA/zpB/iLiprqTRuDWazSY3xawDA=; Received: from root (helo=closure.thunk.org) by imap.thunk.org with local-esmtp (Exim 4.84) (envelope-from ) id 1aXi4g-0000LO-MK; Mon, 22 Feb 2016 04:26:19 +0000 Received: by closure.thunk.org (Postfix, from userid 15806) id 8952982E0BD; Sun, 21 Feb 2016 23:26:13 -0500 (EST) From: Theodore Ts'o To: fstests@vger.kernel.org Cc: Hugh Dickins , Theodore Ts'o Subject: [PATCH 1/4] xfstests: remove dependency on /proc/partitions for generic/312 Date: Sun, 21 Feb 2016 23:26:08 -0500 Message-Id: <1456115171-13191-2-git-send-email-tytso@mit.edu> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456115171-13191-1-git-send-email-tytso@mit.edu> References: <1456115171-13191-1-git-send-email-tytso@mit.edu> X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: tytso@thunk.org X-SA-Exim-Scanned: No (on imap.thunk.org); SAEximRunCond expanded to false Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 From: Hugh Dickins We don't need to do this test at all, since _scratch_mkfs_sized will do this check for us. This allows this test to work with tmpfs. Signed-off-by: Theodore Ts'o Reviewed-by: Christoph Hellwig --- tests/generic/312 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/generic/312 b/tests/generic/312 index b570814..669e19b 100755 --- a/tests/generic/312 +++ b/tests/generic/312 @@ -51,11 +51,6 @@ _require_scratch # 5G in byte fssize=$((2**30 * 5)) -required_blocks=$(($fssize / 1024)) -dev_blocks=$(grep -w $(_short_dev $SCRATCH_DEV) /proc/partitions | $AWK_PROG '{print $3}') -if [ $required_blocks -gt $dev_blocks ];then - _notrun "this test requires \$SCRATCH_DEV has ${fssize}B space" -fi rm -f $seqres.full _scratch_mkfs_sized $fssize >>$seqres.full 2>&1