Re: [PATCH i-g-t 4/4] core: Apply the same treatment to the in errno message in __igt_fail_assert()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Jul 09, 2014 at 11:45:21AM +0100, Damien Lespiau wrote:
> Just like the it was done for the requirement message, display the errno
> message only if errno is set, and display it at the end of the assert
> message.
> 
> Signed-off-by: Damien Lespiau <damien.lespiau@xxxxxxxxx>

Patches 2&4 are Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx>, patch
3 is imo ok with the free dropped.
-Daniel
> ---
>  lib/igt_core.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/lib/igt_core.c b/lib/igt_core.c
> index e66d096..53f750a 100644
> --- a/lib/igt_core.c
> +++ b/lib/igt_core.c
> @@ -682,11 +682,17 @@ void __igt_fail_assert(int exitcode, const char *file,
>  {
>  	va_list args;
>  	int err = errno;
> +	char *err_str = NULL;
> +
> +	if (err)
> +		asprintf(&err_str, "Last errno: %i, %s\n", err, strerror(err));
>  
>  	printf("Test assertion failure function %s, file %s:%i:\n"
> -	       "Last errno: %i, %s\n"
> -	       "Failed assertion: %s\n",
> -	       func, file, line, err, strerror(err), assertion);
> +	       "Failed assertion: %s\n"
> +	       "%s",
> +	       func, file, line, assertion, err_str ?: "");
> +
> +	free(err_str);
>  
>  	if (f) {
>  		va_start(args, f);
> -- 
> 1.8.3.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx




[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]
  Powered by Linux