Whamcloud - gitweb
e2fsprogs: don't run quota test if quota is not enabled
authorEric Sandeen <sandeen@redhat.com>
Mon, 26 May 2014 15:43:24 +0000 (11:43 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 27 May 2014 16:12:05 +0000 (12:12 -0400)
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 <sandeen@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
tests/f_quota/script

index bf25e07..bbe6a9f 100644 (file)
@@ -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