From 0ead9a42fda9a3d6b47085d2059dde732d8a59e1 Mon Sep 17 00:00:00 2001 From: Chandan Rajendra Date: Wed, 20 Mar 2019 19:51:12 +0530 Subject: [PATCH] _require_prjquota: Disable tests only when using realtime fs $USE_EXTERNAL needs to be set when using external log devices. In such a setup, tests which have "_require_prjquota $SCRATCH_DEV" (e.g. generic/383) incorrectly end up being marked as "not run" since the test "[ "$USE_EXTERNAL" = yes -a ! -z "$_dev" ]" evaluates to true. This commit fixes the bug by marking the test as "not run" only when $USE_EXTERNAL is set and one of $TEST_RTDEV or $SCRATCH_RTDEV is set. Signed-off-by: Chandan Rajendra Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- common/quota | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common/quota b/common/quota index 9309e786..f19f81a1 100644 --- a/common/quota +++ b/common/quota @@ -86,8 +86,10 @@ _require_prjquota() fi src/feature -P $_dev [ $? -ne 0 ] && _notrun "Installed kernel does not support project quotas" - if [ "$USE_EXTERNAL" = yes -a ! -z "$_dev" ]; then - _notrun "Project quotas not supported on realtime filesystem" + if [ "$USE_EXTERNAL" = yes ]; then + if [ -n "$TEST_RTDEV" -o -n "$SCRATCH_RTDEV" ]; then + _notrun "Project quotas not supported on realtime filesystem" + fi fi } -- 2.39.5