On Wed, Mar 20, 2019 at 07:51:12PM +0530, Chandan Rajendra wrote:
> $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 <chandan@xxxxxxxxxxxxx>
> ---
> common/quota | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/common/quota b/common/quota
> index 9309e786..cb627f19 100644
> --- a/common/quota
> +++ b/common/quota
> @@ -86,8 +86,9 @@ _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 -a \
> + \( ! -z "$TEST_RTDEV" \-o ! -z "$SCRATCH_RTDEV" \) ]; then
> + _notrun "Project quotas not supported on realtime filesystem"
I changed this to
if [ "$USE_EXTERNAL" = yes ]; then
if [ -n "$TEST_RTDEV" -o -n "$SCRATCH_RTDEV" ]; then
_notrun "Project quotas not supported on realtime filesystem"
fi
fi
which seems easier to read.
Thanks,
Eryu
> fi
> }
>
> --
> 2.19.1
>
