[PATCH v3] tests/fcntl.c: add test for struct f_owner_ex

[Dmitry V. Levin]

On Thu, Mar 29, 2018 at 05:22:17PM +0800, Zhibin Li wrote:
> ---
>  tests/fcntl.c | 41 +++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 41 insertions(+)

Now that your patch is almost ready, it's time to add a gnu style
changelog to the commit message.

> diff --git a/tests/fcntl.c b/tests/fcntl.c
> index 4f62ca2a..606f63bd 100644
> --- a/tests/fcntl.c
> +++ b/tests/fcntl.c
> @@ -69,12 +69,53 @@ test_flock64(void)
>  #endif
>  }
>  
> +static long
> +test_f_owner_ex_type_pid(const int cmd, const char *const cmd_name,
> +			 const int type, const char *const type_name,
> +			 const pid_t pid)
> +{
> +	struct f_owner_ex fo = { .type = type, .pid = pid };
> +
> +	long rc = invoke_test_syscall(cmd, &fo);
> +	printf("%s(0, %s, {type=%s, pid=%d}) = %s\n",
> +	       TEST_SYSCALL_STR, cmd_name, type_name, pid, sprintrc(rc));
> +	return rc;
> +}
> +
> +static void
> +is_esrch_test_f_owner_ex(const int type, const char *const type_name,
> +			 pid_t pid, bool is_esrch)
> +{
> +	if (is_esrch) {
> +		test_f_owner_ex_type_pid(ARG_STR(F_SETOWN_EX),
> +					 type, type_name, pid);
> +	} else {
> +		if (test_f_owner_ex_type_pid(ARG_STR(F_SETOWN_EX),
> +					     type, type_name, pid))
> +			return;
> +		test_f_owner_ex_type_pid(ARG_STR(F_GETOWN_EX),
> +					 type, type_name, pid);
> +	}

	long rc = test_f_owner_ex_type_pid(ARG_STR(F_SETOWN_EX),
					   type, type_name, pid);
	if (!rc && !is_esrch)
		test_f_owner_ex_type_pid(ARG_STR(F_GETOWN_EX),
					 type, type_name, pid);

- isn't it a more concise alternative?

> +}
> +
> +static void
> +test_f_owner_ex(void)
> +{
> +	is_esrch_test_f_owner_ex(ARG_STR(F_OWNER_TID), 1234567890, true);
> +	is_esrch_test_f_owner_ex(ARG_STR(F_OWNER_PID), 1298126790, true);
> +	is_esrch_test_f_owner_ex(ARG_STR(F_OWNER_PGRP), 1294567890, true);
> +	is_esrch_test_f_owner_ex(ARG_STR(F_OWNER_TID), 20, false);
> +	is_esrch_test_f_owner_ex(ARG_STR(F_OWNER_PID), 30, false);
> +	is_esrch_test_f_owner_ex(ARG_STR(F_OWNER_PGRP), 40, false);
> +}
> +
>  int
>  main(void)
>  {
>  	create_sample();
>  	test_flock();
>  	test_flock64();
> +	test_f_owner_ex();
>  
>  	puts("+++ exited with 0 +++");
>  	return 0;

-- 
ldv
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.strace.io/pipermail/strace-devel/attachments/20180329/d0036297/attachment.bin>