From: Eric Sandeen Subject: [PATCH] e2fsprogs: don't run quota test if quota is not enabled Date: Mon, 19 May 2014 15:26:49 -0500 Message-ID: <537A6909.6060700@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit To: ext4 development Return-path: Received: from mx1.redhat.com ([209.132.183.28]:41735 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751046AbaESU0s (ORCPT ); Mon, 19 May 2014 16:26:48 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4JKQlju005946 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 19 May 2014 16:26:48 -0400 Received: from liberator.sandeen.net (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s4JKQkAx005326 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO) for ; Mon, 19 May 2014 16:26:47 -0400 Sender: linux-ext4-owner@vger.kernel.org List-ID: The default configuration still has quota disabled, but runs the f_quota test unconditionally, so we fail by default. Fix that... Signed-off-by: Eric Sandeen --- diff --git a/tests/f_quota/script b/tests/f_quota/script index bf25e07..d1c4b9e 100644 --- a/tests/f_quota/script +++ b/tests/f_quota/script @@ -1,4 +1,11 @@ AFTER_CMD='$DEBUGFS -f $test_dir/debugfs-cmds $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed > $test_name.0.log' PASS_ZERO=true +$TUNE2FS -h 2>&1 | grep -q quota_options +if [ $? != 0 ] ; then + rm -f $TMPFILE + echo "$test_name: $test_description: skipped (quota not enabled)" + return 0 +fi + . $cmd_dir/run_e2fsck