From 74c37088c04fa7f45df403e7b42cb147b2d36db6 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Tue, 5 Apr 2016 11:49:34 +1000 Subject: [PATCH] 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 Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner --- tests/generic/082 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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" -- 2.39.5