summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-11-05 12:17:42 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-11-05 12:17:42 +0000
commitddfa2ef41c044589c1353d7f68702abf48ee82a3 (patch)
treeae34d907c2dedf944342a29ee3104625bbbeb9f1 /src/tests
parentfc949660f70f99fe97e63de65b1b67377d16c6da (diff)
Revert "eo_test_general.c: Make eo_signals tests pass on Windows"
This reverts commit fc949660f70f99fe97e63de65b1b67377d16c6da.
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/eo/suite/eo_test_general.c25
1 files changed, 5 insertions, 20 deletions
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index 7bdb0e170b..ae026a27f4 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -199,26 +199,11 @@ _eo_signals_cb_added_deled(void *data EINA_UNUSED, const Efl_Event *event)
199 fail_if(callback_array->func != _eo_signals_cb_added_deled); 199 fail_if(callback_array->func != _eo_signals_cb_added_deled);
200} 200}
201 201
202// We don't use the EFL_CALLBACKS_ARRAY_DEFINE macro because 202EFL_CALLBACKS_ARRAY_DEFINE(_eo_signals_callbacks,
203// we need the callbacks be called in a specific order 203{ EV_A_CHANGED, _eo_signals_a_changed_cb },
204static Efl_Callback_Array_Item * 204{ EV_A_CHANGED, _eo_signals_a_changed_cb2 },
205_eo_signals_callbacks(void) 205{ EV_A_CHANGED, _eo_signals_a_changed_never },
206{ 206{ EFL_EVENT_DEL, _eo_signals_efl_del_cb });
207 static Efl_Callback_Array_Item items[] =
208 {
209 { EV_A_CHANGED, _eo_signals_a_changed_cb },
210 { EV_A_CHANGED, _eo_signals_a_changed_cb2 },
211 { EV_A_CHANGED, _eo_signals_a_changed_never },
212 { 0, _eo_signals_efl_del_cb },
213 { 0, 0 },
214 };
215
216 // On Windows, because _EFL_EVENT_DEL is a symbol exported
217 // from the DLL, we can't assign from a context expression
218 items[3].desc = EFL_EVENT_DEL;
219
220 return items;
221}
222 207
223EFL_START_TEST(eo_signals) 208EFL_START_TEST(eo_signals)
224{ 209{