summaryrefslogtreecommitdiff
path: root/src/tests/evas/evas_test_evasgl.c
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 /src/tests/evas/evas_test_evasgl.c
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
Diffstat (limited to 'src/tests/evas/evas_test_evasgl.c')
-rw-r--r--src/tests/evas/evas_test_evasgl.c2
1 files changed, 0 insertions, 2 deletions
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