Re: [LTP] [PATCH v2] quotactl06: Fix tmpdir cleanup if setup() exits early

["xuyang2018.jy@fujitsu.com" <xuyang2018.jy@fujitsu.com>]

Hi Martin

Looks good to me,
Reviewed-by: Yang Xu <xuyang2018.jy@fujitsu.com>

Best Regards
Yang Xu
> When setup() exits with TCONF before USRPATH or TESTDIR1 get created,
> cleanup() will trigger TWARN when it tries to delete them. Check whether
> the file and directory exists before removing them.
> 
> Signed-off-by: Martin Doucha<mdoucha@suse.cz>
> ---
> 
> Changes since v1:
> - Also check whether USRPATH exists before deleting it
> 
>   testcases/kernel/syscalls/quotactl/quotactl06.c | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/testcases/kernel/syscalls/quotactl/quotactl06.c b/testcases/kernel/syscalls/quotactl/quotactl06.c
> index 8e9a17393..87715237f 100644
> --- a/testcases/kernel/syscalls/quotactl/quotactl06.c
> +++ b/testcases/kernel/syscalls/quotactl/quotactl06.c
> @@ -206,8 +206,11 @@ static void setup(void)
> 
>   static void cleanup(void)
>   {
> -	SAFE_UNLINK(USRPATH);
> -	SAFE_RMDIR(TESTDIR1);
> +	if (!access(USRPATH, F_OK))
> +		SAFE_UNLINK(USRPATH);
> +
> +	if (!access(TESTDIR1, F_OK))
> +		SAFE_RMDIR(TESTDIR1);
>   }
> 
>   static struct tst_test test = {

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp