Re: [LTP] [PATCH 1/2] syscalls/fanotify14: Encode the expected errno in test case

[Matthew Bobrowski via ltp <ltp@lists.linux.it>]

On Tue, Jul 19, 2022 at 11:58:52AM +0200, Amir Goldstein wrote:
> So we can add test cases for errors other than EINVAL.

Just one optional nit. We can probably remove the comments which are
directly above the existing `if (errno == EINVAL)` checks as they're
specific to one expected errno value, but this is no longer the case
with ENOTDIR now in some fanotify_init/fanotify_mark cases.

Feel free to add RVB tags.

> Signed-off-by: Amir Goldstein <amir73il@gmail.com>
> ---
>  .../kernel/syscalls/fanotify/fanotify14.c     | 31 ++++++++++---------
>  1 file changed, 16 insertions(+), 15 deletions(-)
> 
> diff --git a/testcases/kernel/syscalls/fanotify/fanotify14.c b/testcases/kernel/syscalls/fanotify/fanotify14.c
> index 5d74b9b91..c99e19706 100644
> --- a/testcases/kernel/syscalls/fanotify/fanotify14.c
> +++ b/testcases/kernel/syscalls/fanotify/fanotify14.c
> @@ -41,38 +41,39 @@ static struct test_case_t {
>  	unsigned int init_flags;
>  	unsigned int mark_flags;
>  	unsigned long long mask;
> +	int expected_errno;
>  } test_cases[] = {
>  	{
> -		FAN_CLASS_CONTENT | FAN_REPORT_FID, 0, 0
> +		FAN_CLASS_CONTENT | FAN_REPORT_FID, 0, 0, EINVAL
>  	},
>  	{
> -		FAN_CLASS_PRE_CONTENT | FAN_REPORT_FID, 0, 0
> +		FAN_CLASS_PRE_CONTENT | FAN_REPORT_FID, 0, 0, EINVAL
>  	},
>  	{
> -		FAN_CLASS_NOTIF, 0, INODE_EVENTS
> +		FAN_CLASS_NOTIF, 0, INODE_EVENTS, EINVAL
>  	},
>  	{
> -		FAN_CLASS_NOTIF | FAN_REPORT_FID, FAN_MARK_MOUNT, INODE_EVENTS
> +		FAN_CLASS_NOTIF | FAN_REPORT_FID, FAN_MARK_MOUNT, INODE_EVENTS, EINVAL
>  	},
>  	{
>  		/* FAN_REPORT_NAME without FAN_REPORT_DIR_FID is not valid */
> -		FAN_CLASS_NOTIF | FAN_REPORT_NAME, 0, 0
> +		FAN_CLASS_NOTIF | FAN_REPORT_NAME, 0, 0, EINVAL
>  	},
>  	{
>  		/* FAN_REPORT_NAME without FAN_REPORT_DIR_FID is not valid */
> -		FAN_CLASS_NOTIF | FAN_REPORT_FID | FAN_REPORT_NAME, 0, 0
> +		FAN_CLASS_NOTIF | FAN_REPORT_FID | FAN_REPORT_NAME, 0, 0, EINVAL
>  	},
>  	{
>  		/* FAN_REPORT_TARGET_FID without FAN_REPORT_FID is not valid */
> -		FAN_CLASS_NOTIF | FAN_REPORT_TARGET_FID | FAN_REPORT_DFID_NAME, 0, 0
> +		FAN_CLASS_NOTIF | FAN_REPORT_TARGET_FID | FAN_REPORT_DFID_NAME, 0, 0, EINVAL
>  	},
>  	{
>  		/* FAN_REPORT_TARGET_FID without FAN_REPORT_NAME is not valid */
> -		FAN_CLASS_NOTIF | FAN_REPORT_TARGET_FID | FAN_REPORT_DFID_FID, 0, 0
> +		FAN_CLASS_NOTIF | FAN_REPORT_TARGET_FID | FAN_REPORT_DFID_FID, 0, 0, EINVAL
>  	},
>  	{
>  		/* FAN_RENAME without FAN_REPORT_NAME is not valid */
> -		FAN_CLASS_NOTIF | FAN_REPORT_DFID_FID, 0, FAN_RENAME
> +		FAN_CLASS_NOTIF | FAN_REPORT_DFID_FID, 0, FAN_RENAME, EINVAL
>  	},
>  };
>  
> @@ -88,12 +89,12 @@ static void do_test(unsigned int number)
>  		 * an invalid notification class is specified in
>  		 * conjunction with FAN_REPORT_FID.
>  		 */
> -		if (errno == EINVAL) {
> +		if (errno == tc->expected_errno) {
>  			tst_res(TPASS,
>  				"fanotify_fd=%d, fanotify_init(%x, O_RDONLY) "
> -				"failed with error EINVAL as expected",
> +				"failed with error %d as expected",
>  				fanotify_fd,
> -				tc->init_flags);
> +				tc->init_flags, tc->expected_errno);
>  			return;
>  		}
>  		tst_brk(TBROK | TERRNO,
> @@ -126,16 +127,16 @@ static void do_test(unsigned int number)
>  		 * specified on the notification group, or using
>  		 * INODE_EVENTS with mark type FAN_MARK_MOUNT.
>  		 */
> -		if (errno == EINVAL) {
> +		if (errno == tc->expected_errno) {
>  			tst_res(TPASS,
>  				"ret=%d, fanotify_mark(%d, FAN_MARK_ADD | %x, "
> -				"%llx, AT_FDCWD, %s) failed with error EINVAL "
> +				"%llx, AT_FDCWD, %s) failed with error %d "
>  				"as expected",
>  				ret,
>  				fanotify_fd,
>  				tc->mark_flags,
>  				tc->mask,
> -				FILE1);
> +				FILE1, tc->expected_errno);
>  			goto out;
>  		}
>  		tst_brk(TBROK | TERRNO,
> -- 
> 2.25.1
> 
/M

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