From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 5 Apr 2016 01:49:34 +0000 (+1000)
Subject: generic/082: filter out project quota status
X-Git-Tag: v2022.05.01~2541
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=74c37088c04fa7f45df403e7b42cb147b2d36db6;p=xfstests-dev.git

generic/082: filter out project quota status

In the most recent quota tools package, with the new project quota
support, quotaon -p prints an extra line which generic/082.out isn't
expecting.  So filter it out.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

diff --git a/tests/generic/082 b/tests/generic/082
index ca77c25e..a727c106 100755
--- a/tests/generic/082
+++ b/tests/generic/082
@@ -36,6 +36,11 @@ _cleanup()
 	rm -f $tmp.*
 }
 
+_filter_project_quota()
+{
+    grep -v "^project quota on"
+}
+
 # get standard environment, filters and checks
 . ./common/rc
 . ./common/filter
@@ -64,7 +69,7 @@ quotaon $SCRATCH_MNT >>$seqres.full 2>&1
 # just ignored, but quota is still on. This may change in future, let's
 # re-consider the case then.
 _scratch_mount "-o remount,ro,nosuchopt" >>$seqres.full 2>&1
-quotaon -p $SCRATCH_MNT | _filter_scratch
+quotaon -p $SCRATCH_MNT | _filter_scratch | _filter_project_quota
 # second remount should succeed, no oops or hang expected
 _scratch_mount "-o remount,ro" || _fail "second remount,ro failed"