forked from enlightenment/efl
eo_test_general.c: Make eo_signals tests pass on Windows
Summary: EFL_CALLBACKS_ARRAY_DEFINE reorders the callbacks according to efl_callbacks_cmp. efl_callbacks_cmp compares the address of the desc field, which depends on the memory layout generated by the linker. To make the test run deterministically, we define the array of callbacks manually. Reviewers: vtorri, felipealmeida, raster Reviewed By: raster Subscribers: cedric, #reviewers, #committers, jptiz, felipealmeida Tags: #efl Differential Revision: https://phab.enlightenment.org/D12043
This commit is contained in:
parent
888e1e7401
commit
fc949660f7
|
@ -199,11 +199,26 @@ _eo_signals_cb_added_deled(void *data EINA_UNUSED, const Efl_Event *event)
|
||||||
fail_if(callback_array->func != _eo_signals_cb_added_deled);
|
fail_if(callback_array->func != _eo_signals_cb_added_deled);
|
||||||
}
|
}
|
||||||
|
|
||||||
EFL_CALLBACKS_ARRAY_DEFINE(_eo_signals_callbacks,
|
// We don't use the EFL_CALLBACKS_ARRAY_DEFINE macro because
|
||||||
{ EV_A_CHANGED, _eo_signals_a_changed_cb },
|
// we need the callbacks be called in a specific order
|
||||||
{ EV_A_CHANGED, _eo_signals_a_changed_cb2 },
|
static Efl_Callback_Array_Item *
|
||||||
{ EV_A_CHANGED, _eo_signals_a_changed_never },
|
_eo_signals_callbacks(void)
|
||||||
{ EFL_EVENT_DEL, _eo_signals_efl_del_cb });
|
{
|
||||||
|
static Efl_Callback_Array_Item items[] =
|
||||||
|
{
|
||||||
|
{ EV_A_CHANGED, _eo_signals_a_changed_cb },
|
||||||
|
{ EV_A_CHANGED, _eo_signals_a_changed_cb2 },
|
||||||
|
{ EV_A_CHANGED, _eo_signals_a_changed_never },
|
||||||
|
{ 0, _eo_signals_efl_del_cb },
|
||||||
|
{ 0, 0 },
|
||||||
|
};
|
||||||
|
|
||||||
|
// On Windows, because _EFL_EVENT_DEL is a symbol exported
|
||||||
|
// from the DLL, we can't assign from a context expression
|
||||||
|
items[3].desc = EFL_EVENT_DEL;
|
||||||
|
|
||||||
|
return items;
|
||||||
|
}
|
||||||
|
|
||||||
EFL_START_TEST(eo_signals)
|
EFL_START_TEST(eo_signals)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue