summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-01-05 02:14:06 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-01-05 02:34:16 +0900
commite30fb6945e10cc8fd4b519684068072c82fee3d9 (patch)
tree9462b2eeab6b9c01e8f9efc83b3b126b8f3671de
parent0fd8cd82e3e45dc9a5912cde2a330d1ef05a27b7 (diff)
fix evas test suite to now init both ecore and evas.... correctly.
see c8dcc4327b803e9b8ad2a0985e756c924946c442 - basicall evas depends on ecore these days... thus requires ecore be initted THEN evas. ... which in theory is an abi break for those using evas and ONLY evas long ago from when efl was separate... but it''s how we're building these days. @fix
-rw-r--r--src/tests/edje/edje_tests_helpers.h6
-rw-r--r--src/tests/evas/evas_suite.c5
-rw-r--r--src/tests/evas/evas_test_callbacks.c3
-rw-r--r--src/tests/evas/evas_test_evasgl.c2
-rw-r--r--src/tests/evas/evas_test_filters.c2
-rw-r--r--src/tests/evas/evas_test_image.c21
-rw-r--r--src/tests/evas/evas_test_mask.c4
-rw-r--r--src/tests/evas/evas_test_mesh.c2
-rw-r--r--src/tests/evas/evas_test_object.c4
-rw-r--r--src/tests/evas/evas_test_object_smart.c3
-rw-r--r--src/tests/evas/evas_test_text.c2
-rw-r--r--src/tests/evas/evas_test_textblock.c2
-rw-r--r--src/tests/evas/evas_tests_helpers.h6
13 files changed, 32 insertions, 30 deletions
diff --git a/src/tests/edje/edje_tests_helpers.h b/src/tests/edje/edje_tests_helpers.h
index 0319c94903..530d10e6e3 100644
--- a/src/tests/edje/edje_tests_helpers.h
+++ b/src/tests/edje/edje_tests_helpers.h
@@ -1,6 +1,8 @@
1#ifndef EDJE_TEST_HELPERS_H 1#ifndef EDJE_TEST_HELPERS_H
2#define EDJE_TEST_HELPERS_H 2#define EDJE_TEST_HELPERS_H
3 3
4#include <Ecore_Evas.h>
5
4/* FIXME: Currently depends on the buffer engine, should we do anything 6/* FIXME: Currently depends on the buffer engine, should we do anything
5 * fancier? */ 7 * fancier? */
6 8
@@ -11,7 +13,7 @@
11 { \ 13 { \
12 edje_shutdown(); \ 14 edje_shutdown(); \
13 evas_free(evas); \ 15 evas_free(evas); \
14 evas_shutdown(); \ 16 ecore_evas_shutdown(); \
15 } \ 17 } \
16 while (0) 18 while (0)
17 19
@@ -21,7 +23,7 @@ _setup_evas()
21 Evas *evas; 23 Evas *evas;
22 Evas_Engine_Info *einfo; 24 Evas_Engine_Info *einfo;
23 25
24 evas_init(); 26 ecore_evas_init();
25 edje_init(); 27 edje_init();
26 28
27 evas = evas_new(); 29 evas = evas_new();
diff --git a/src/tests/evas/evas_suite.c b/src/tests/evas/evas_suite.c
index 45418c9775..78fe314c9a 100644
--- a/src/tests/evas/evas_suite.c
+++ b/src/tests/evas/evas_suite.c
@@ -3,6 +3,7 @@
3#endif 3#endif
4 4
5#include <Evas.h> 5#include <Evas.h>
6#include <Ecore_Evas.h>
6 7
7#include "evas_suite.h" 8#include "evas_suite.h"
8#include "../efl_check.h" 9#include "../efl_check.h"
@@ -36,12 +37,12 @@ main(int argc, char **argv)
36 putenv("EFL_RUN_IN_TREE=1"); 37 putenv("EFL_RUN_IN_TREE=1");
37#endif 38#endif
38 39
39 evas_init(); 40 ecore_evas_init();
40 41
41 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1, 42 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
42 "Evas", etc); 43 "Evas", etc);
43 44
44 evas_shutdown(); 45 ecore_evas_shutdown();
45 46
46 return (failed_count == 0) ? 0 : 255; 47 return (failed_count == 0) ? 0 : 255;
47} 48}
diff --git a/src/tests/evas/evas_test_callbacks.c b/src/tests/evas/evas_test_callbacks.c
index 3f83847202..c871276f65 100644
--- a/src/tests/evas/evas_test_callbacks.c
+++ b/src/tests/evas/evas_test_callbacks.c
@@ -5,6 +5,7 @@
5#include <stdio.h> 5#include <stdio.h>
6 6
7#include <Evas.h> 7#include <Evas.h>
8#include <Ecore_Evas.h>
8 9
9#include "evas_suite.h" 10#include "evas_suite.h"
10#include "evas_tests_helpers.h" 11#include "evas_tests_helpers.h"
@@ -24,7 +25,7 @@ do \
24{ \ 25{ \
25 evas_object_del(rect); \ 26 evas_object_del(rect); \
26 evas_free(evas); \ 27 evas_free(evas); \
27 evas_shutdown(); \ 28 ecore_evas_shutdown(); \
28} \ 29} \
29while (0) 30while (0)
30 31
diff --git a/src/tests/evas/evas_test_evasgl.c b/src/tests/evas/evas_test_evasgl.c
index 181ed2b031..67f39de598 100644
--- a/src/tests/evas/evas_test_evasgl.c
+++ b/src/tests/evas/evas_test_evasgl.c
@@ -42,7 +42,6 @@ _detect_osmesa(void)
42 Ecore_Evas *ee; Evas *evas; Evas_Object *im = NULL; \ 42 Ecore_Evas *ee; Evas *evas; Evas_Object *im = NULL; \
43 if (!strcmp(engine, "buffer") && !_detect_osmesa()) return; \ 43 if (!strcmp(engine, "buffer") && !_detect_osmesa()) return; \
44 putenv("EVAS_GL_API_DEBUG=1"); \ 44 putenv("EVAS_GL_API_DEBUG=1"); \
45 evas_init(); \
46 ecore_evas_init(); \ 45 ecore_evas_init(); \
47 if (!options || !strcmp(engine, "buffer")) ee = ecore_evas_new(engine, 0, 0, 1, 1, NULL); \ 46 if (!options || !strcmp(engine, "buffer")) ee = ecore_evas_new(engine, 0, 0, 1, 1, NULL); \
48 else ee = ecore_evas_gl_x11_options_new(NULL, 0, 0, 0, 1, 1, options); \ 47 else ee = ecore_evas_gl_x11_options_new(NULL, 0, 0, 0, 1, 1, options); \
@@ -62,7 +61,6 @@ _detect_osmesa(void)
62 evas_object_del(im); \ 61 evas_object_del(im); \
63 ecore_evas_free(ee); \ 62 ecore_evas_free(ee); \
64 ecore_evas_shutdown(); \ 63 ecore_evas_shutdown(); \
65 evas_shutdown(); \
66 do {} while (0) 64 do {} while (0)
67 65
68static void 66static void
diff --git a/src/tests/evas/evas_test_filters.c b/src/tests/evas/evas_test_filters.c
index 07e2928092..6095c63a2a 100644
--- a/src/tests/evas/evas_test_filters.c
+++ b/src/tests/evas/evas_test_filters.c
@@ -25,7 +25,6 @@
25 Ecore_Evas *ee; Evas *evas; \ 25 Ecore_Evas *ee; Evas *evas; \
26 Evas_Object *to; \ 26 Evas_Object *to; \
27 setenv("EVAS_DATA_DIR", EVAS_DATA_DIR, 1); \ 27 setenv("EVAS_DATA_DIR", EVAS_DATA_DIR, 1); \
28 evas_init(); \
29 ecore_evas_init(); \ 28 ecore_evas_init(); \
30 ee = ecore_evas_buffer_new(1, 1); \ 29 ee = ecore_evas_buffer_new(1, 1); \
31 ecore_evas_show(ee); \ 30 ecore_evas_show(ee); \
@@ -43,7 +42,6 @@
43 evas_object_del(to); \ 42 evas_object_del(to); \
44 ecore_evas_free(ee); \ 43 ecore_evas_free(ee); \
45 ecore_evas_shutdown(); \ 44 ecore_evas_shutdown(); \
46 evas_shutdown(); \
47 do {} while (0) 45 do {} while (0)
48 46
49#ifdef LITTLE_ENDIAN 47#ifdef LITTLE_ENDIAN
diff --git a/src/tests/evas/evas_test_image.c b/src/tests/evas/evas_test_image.c
index e0637a12fe..392084145a 100644
--- a/src/tests/evas/evas_test_image.c
+++ b/src/tests/evas/evas_test_image.c
@@ -8,6 +8,7 @@
8#include <unistd.h> 8#include <unistd.h>
9 9
10#include <Evas.h> 10#include <Evas.h>
11#include <Ecore_Evas.h>
11 12
12#include "evas_suite.h" 13#include "evas_suite.h"
13#include "evas_tests_helpers.h" 14#include "evas_tests_helpers.h"
@@ -86,7 +87,7 @@ START_TEST(evas_object_image_loader)
86 evas_object_del(o); 87 evas_object_del(o);
87 88
88 evas_free(e); 89 evas_free(e);
89 evas_shutdown(); 90 ecore_evas_shutdown();
90} 91}
91END_TEST 92END_TEST
92 93
@@ -281,7 +282,7 @@ START_TEST(evas_object_image_loader_orientation)
281 evas_object_del(rot); 282 evas_object_del(rot);
282 283
283 evas_free(e); 284 evas_free(e);
284 evas_shutdown(); 285 ecore_evas_shutdown();
285} 286}
286END_TEST 287END_TEST
287 288
@@ -331,7 +332,7 @@ START_TEST(evas_object_image_orient)
331 evas_object_del(orig); 332 evas_object_del(orig);
332 333
333 evas_free(e); 334 evas_free(e);
334 evas_shutdown(); 335 ecore_evas_shutdown();
335} 336}
336END_TEST 337END_TEST
337 338
@@ -389,7 +390,7 @@ START_TEST(evas_object_image_tgv_loader_data)
389 eina_strbuf_free(str); 390 eina_strbuf_free(str);
390 391
391 evas_free(e); 392 evas_free(e);
392 evas_shutdown(); 393 ecore_evas_shutdown();
393} 394}
394END_TEST 395END_TEST
395#endif 396#endif
@@ -459,7 +460,7 @@ START_TEST(evas_object_image_all_loader_data)
459 eina_strbuf_free(str); 460 eina_strbuf_free(str);
460 461
461 evas_free(e); 462 evas_free(e);
462 evas_shutdown(); 463 ecore_evas_shutdown();
463} 464}
464END_TEST 465END_TEST
465 466
@@ -520,7 +521,7 @@ START_TEST(evas_object_image_buggy)
520 eina_strbuf_free(str); 521 eina_strbuf_free(str);
521 522
522 evas_free(e); 523 evas_free(e);
523 evas_shutdown(); 524 ecore_evas_shutdown();
524} 525}
525END_TEST 526END_TEST
526 527
@@ -631,7 +632,7 @@ START_TEST(evas_object_image_partially_load_orientation)
631 evas_object_del(orig); 632 evas_object_del(orig);
632 633
633 evas_free(e); 634 evas_free(e);
634 evas_shutdown(); 635 ecore_evas_shutdown();
635} 636}
636END_TEST 637END_TEST
637 638
@@ -658,7 +659,7 @@ START_TEST(evas_object_image_defaults)
658 efl_del(o); 659 efl_del(o);
659 660
660 evas_free(e); 661 evas_free(e);
661 evas_shutdown(); 662 ecore_evas_shutdown();
662} 663}
663END_TEST 664END_TEST
664 665
@@ -822,7 +823,7 @@ START_TEST(evas_object_image_map_unmap)
822 // TODO: test more color conversions 823 // TODO: test more color conversions
823 824
824 evas_free(e); 825 evas_free(e);
825 evas_shutdown(); 826 ecore_evas_shutdown();
826} 827}
827END_TEST 828END_TEST
828 829
@@ -874,7 +875,7 @@ START_TEST(evas_object_image_jp2k_loader_data)
874 eina_strbuf_free(str); 875 eina_strbuf_free(str);
875 876
876 evas_free(e); 877 evas_free(e);
877 evas_shutdown(); 878 ecore_evas_shutdown();
878} 879}
879END_TEST 880END_TEST
880#endif 881#endif
diff --git a/src/tests/evas/evas_test_mask.c b/src/tests/evas/evas_test_mask.c
index 1f160444e4..56b12e811e 100644
--- a/src/tests/evas/evas_test_mask.c
+++ b/src/tests/evas/evas_test_mask.c
@@ -15,7 +15,6 @@
15 15
16#define START_MASK_TEST(w, h) \ 16#define START_MASK_TEST(w, h) \
17 Ecore_Evas *ee; Evas *e; \ 17 Ecore_Evas *ee; Evas *e; \
18 evas_init(); \
19 ecore_evas_init(); \ 18 ecore_evas_init(); \
20 ee = ecore_evas_buffer_new(w, h); \ 19 ee = ecore_evas_buffer_new(w, h); \
21 ecore_evas_show(ee); \ 20 ecore_evas_show(ee); \
@@ -29,7 +28,6 @@
29 EINA_LIST_FREE(tofree, o) { evas_object_del(o); } \ 28 EINA_LIST_FREE(tofree, o) { evas_object_del(o); } \
30 ecore_evas_free(ee); \ 29 ecore_evas_free(ee); \
31 ecore_evas_shutdown(); \ 30 ecore_evas_shutdown(); \
32 evas_shutdown(); \
33 } while (0) 31 } while (0)
34 32
35#define AUTODEL(o) do { tofree = eina_list_prepend(tofree, o); } while (0) 33#define AUTODEL(o) do { tofree = eina_list_prepend(tofree, o); } while (0)
@@ -101,7 +99,7 @@ START_TEST(evas_mask_test_setget)
101 evas_object_del(obj); 99 evas_object_del(obj);
102 100
103 evas_free(e); 101 evas_free(e);
104 evas_shutdown(); 102 ecore_evas_shutdown();
105} 103}
106END_TEST 104END_TEST
107 105
diff --git a/src/tests/evas/evas_test_mesh.c b/src/tests/evas/evas_test_mesh.c
index 9eaeac4944..958e443f70 100644
--- a/src/tests/evas/evas_test_mesh.c
+++ b/src/tests/evas/evas_test_mesh.c
@@ -146,7 +146,7 @@ START_TEST(evas_object_mesh_loader_saver)
146 unlink(tmp); 146 unlink(tmp);
147 147
148 evas_free(e); 148 evas_free(e);
149 evas_shutdown(); 149 ecore_evas_shutdown();
150} 150}
151END_TEST 151END_TEST
152 152
diff --git a/src/tests/evas/evas_test_object.c b/src/tests/evas/evas_test_object.c
index 9718c8dd64..70e5d40f05 100644
--- a/src/tests/evas/evas_test_object.c
+++ b/src/tests/evas/evas_test_object.c
@@ -26,8 +26,8 @@ START_TEST(evas_object_various)
26 26
27 27
28 /* Twice because EVAS_TEST_INIT_EVAS inits it twice. */ 28 /* Twice because EVAS_TEST_INIT_EVAS inits it twice. */
29 evas_shutdown(); 29 ecore_evas_shutdown();
30 evas_shutdown(); 30 ecore_evas_shutdown();
31} 31}
32END_TEST 32END_TEST
33 33
diff --git a/src/tests/evas/evas_test_object_smart.c b/src/tests/evas/evas_test_object_smart.c
index dbf88e0a7a..648402a12f 100644
--- a/src/tests/evas/evas_test_object_smart.c
+++ b/src/tests/evas/evas_test_object_smart.c
@@ -11,6 +11,7 @@
11 11
12#include <Eina.h> 12#include <Eina.h>
13#include <Evas.h> 13#include <Evas.h>
14#include <Ecore_Evas.h>
14 15
15#include "evas_suite.h" 16#include "evas_suite.h"
16#include "evas_tests_helpers.h" 17#include "evas_tests_helpers.h"
@@ -42,7 +43,7 @@ do \
42{ \ 43{ \
43 evas_object_del(smart_obj); \ 44 evas_object_del(smart_obj); \
44 evas_free(evas); \ 45 evas_free(evas); \
45 evas_shutdown(); \ 46 ecore_evas_shutdown(); \
46} \ 47} \
47while (0) 48while (0)
48 49
diff --git a/src/tests/evas/evas_test_text.c b/src/tests/evas/evas_test_text.c
index f8508ec289..c279d5571c 100644
--- a/src/tests/evas/evas_test_text.c
+++ b/src/tests/evas/evas_test_text.c
@@ -33,7 +33,7 @@ do \
33{ \ 33{ \
34 evas_object_del(to); \ 34 evas_object_del(to); \
35 evas_free(evas); \ 35 evas_free(evas); \
36 evas_shutdown(); \ 36 ecore_evas_shutdown(); \
37} \ 37} \
38while (0) 38while (0)
39 39
diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c
index e77b066a93..0e6057cf58 100644
--- a/src/tests/evas/evas_test_textblock.c
+++ b/src/tests/evas/evas_test_textblock.c
@@ -58,7 +58,7 @@ do \
58 evas_object_del(tb); \ 58 evas_object_del(tb); \
59 evas_textblock_style_free(st); \ 59 evas_textblock_style_free(st); \
60 evas_free(evas); \ 60 evas_free(evas); \
61 evas_shutdown(); \ 61 ecore_evas_shutdown(); \
62} \ 62} \
63while (0) 63while (0)
64 64
diff --git a/src/tests/evas/evas_tests_helpers.h b/src/tests/evas/evas_tests_helpers.h
index 79f655c112..561502aba3 100644
--- a/src/tests/evas/evas_tests_helpers.h
+++ b/src/tests/evas/evas_tests_helpers.h
@@ -1,6 +1,8 @@
1#ifndef EVAS_TEST_HELPERS_H 1#ifndef EVAS_TEST_HELPERS_H
2#define EVAS_TEST_HELPERS_H 2#define EVAS_TEST_HELPERS_H
3 3
4#include <Ecore_Evas.h>
5
4/* FIXME: Currently depends on the buffer engine, should we do anything 6/* FIXME: Currently depends on the buffer engine, should we do anything
5 * fancier? */ 7 * fancier? */
6 8
@@ -13,7 +15,7 @@ do \
13 evas_object_del(tb); \ 15 evas_object_del(tb); \
14 evas_textblock_style_free(st); \ 16 evas_textblock_style_free(st); \
15 evas_free(evas); \ 17 evas_free(evas); \
16 evas_shutdown(); \ 18 ecore_evas_shutdown(); \
17} \ 19} \
18while (0) 20while (0)
19 21
@@ -23,7 +25,7 @@ _setup_evas()
23 Evas *evas; 25 Evas *evas;
24 Evas_Engine_Info *einfo; 26 Evas_Engine_Info *einfo;
25 27
26 evas_init(); 28 ecore_evas_init();
27 evas = evas_new(); 29 evas = evas_new();
28 30
29 evas_output_method_set(evas, evas_render_method_lookup("buffer")); 31 evas_output_method_set(evas, evas_render_method_lookup("buffer"));