From 2eb0ed09d968ac86d9c6e241d3c78e7d4395383a Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Mon, 26 May 2014 11:43:24 -0400 Subject: [PATCH] e2fsprogs: don't run quota test if quota is not enabled 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 Signed-off-by: Theodore Ts'o --- tests/f_quota/script | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/f_quota/script b/tests/f_quota/script index bf25e07..bbe6a9f 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 -- 1.8.3.1