RE: [PATCH v5 2/2] Make unit test compatible with GLIB v2.28

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

 



H Luiz, Felipe, Szymon,

> From: Gix, Brian
> 
> ---
>  unit/test-midi.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/unit/test-midi.c b/unit/test-midi.c index d318b07..3995c86 100644
> --- a/unit/test-midi.c
> +++ b/unit/test-midi.c
> @@ -282,8 +282,12 @@ static void compare_events(const snd_seq_event_t
> *ev1,
>  		                ev2->data.control.value);
>  		break;
>  	case SND_SEQ_EVENT_SYSEX:
> -		g_assert_cmpmem(ev1->data.ext.ptr, ev1->data.ext.len,
> -		                ev2->data.ext.ptr, ev2->data.ext.len);
> +		g_assert_cmpint(ev1->data.ext.len,
> +		                ==,
> +		                ev2->data.ext.len);
> +		g_assert(memcmp(ev1->data.ext.ptr,
> +		                ev2->data.ext.ptr,
> +		                ev2->data.ext.len) == 0);
>  		break;
>  	default:
>  		g_assert_not_reached();


Here is a straightforward rework of the g_assert_cmpmem assert.

It was used only once, and both replacement asserts existed pre-v2.28
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux