devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=4068d1c5be2fe2ed56586243adfca86bbbbf2f30
commit 4068d1c5be2fe2ed56586243adfca86bbbbf2f30 Author: Christopher Michael <[email protected]> Date: Tue Nov 5 09:44:53 2019 -0500 tests/ecore-wl2: Remove surface test This test is not necessary anymore as the ecore_wl2_surface function it was testing is now an internal function ref T8016 --- src/tests/ecore_wl2/ecore_wl2_suite.c | 1 - src/tests/ecore_wl2/ecore_wl2_suite.h | 1 - src/tests/ecore_wl2/ecore_wl2_test_surface.c | 56 ---------------------------- src/tests/ecore_wl2/meson.build | 3 +- 4 files changed, 1 insertion(+), 60 deletions(-) diff --git a/src/tests/ecore_wl2/ecore_wl2_suite.c b/src/tests/ecore_wl2/ecore_wl2_suite.c index 623d601cd6..b6875c006d 100644 --- a/src/tests/ecore_wl2/ecore_wl2_suite.c +++ b/src/tests/ecore_wl2/ecore_wl2_suite.c @@ -13,7 +13,6 @@ static const Efl_Test_Case etc[] = { "Display", ecore_wl2_test_display }, { "Window", ecore_wl2_test_window }, { "Input", ecore_wl2_test_input }, - { "Surface", ecore_wl2_test_surface }, #endif { NULL, NULL } }; diff --git a/src/tests/ecore_wl2/ecore_wl2_suite.h b/src/tests/ecore_wl2/ecore_wl2_suite.h index ce0e1b482f..a8edf93074 100644 --- a/src/tests/ecore_wl2/ecore_wl2_suite.h +++ b/src/tests/ecore_wl2/ecore_wl2_suite.h @@ -8,6 +8,5 @@ void ecore_wl2_test_init(TCase *tc); void ecore_wl2_test_display(TCase *tc); void ecore_wl2_test_window(TCase *tc); void ecore_wl2_test_input(TCase *tc); -void ecore_wl2_test_surface(TCase *tc); #endif diff --git a/src/tests/ecore_wl2/ecore_wl2_test_surface.c b/src/tests/ecore_wl2/ecore_wl2_test_surface.c deleted file mode 100644 index f4252e1664..0000000000 --- a/src/tests/ecore_wl2/ecore_wl2_test_surface.c +++ /dev/null @@ -1,56 +0,0 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include <stdio.h> -#include <unistd.h> -#include <Eina.h> -#include <Ecore.h> -#include <Ecore_Wl2.h> - -#include "ecore_wl2_suite.h" - -static Ecore_Wl2_Display * -_display_connect(void) -{ - Ecore_Wl2_Display *disp; - - disp = ecore_wl2_display_connect(NULL); - return disp; -} - -static Ecore_Wl2_Window * -_window_create(Ecore_Wl2_Display *disp) -{ - Ecore_Wl2_Window *win; - - win = ecore_wl2_window_new(disp, NULL, 100, 100, 500, 500); - return win; -} - -EFL_START_TEST(wl2_surface_create) -{ - Ecore_Wl2_Display *disp; - Ecore_Wl2_Window *win; - Ecore_Wl2_Surface *surf; - - disp = _display_connect(); - ck_assert(disp != NULL); - - win = _window_create(disp); - ck_assert(win != NULL); - - surf = ecore_wl2_surface_create(win, EINA_FALSE); - ck_assert(surf != NULL); -} -EFL_END_TEST - -void -ecore_wl2_test_surface(TCase *tc) -{ - if (getenv("WAYLAND_DISPLAY")) - { - /* surface tests can only run if there is an existing compositor */ - tcase_add_test(tc, wl2_surface_create); - } -} diff --git a/src/tests/ecore_wl2/meson.build b/src/tests/ecore_wl2/meson.build index c1d37cbbdd..eb1a13db6a 100644 --- a/src/tests/ecore_wl2/meson.build +++ b/src/tests/ecore_wl2/meson.build @@ -5,8 +5,7 @@ ecore_wl2_suite_src = [ 'ecore_wl2_test_ecore_wl2.c', 'ecore_wl2_test_display.c', 'ecore_wl2_test_window.c', - 'ecore_wl2_test_input.c', - 'ecore_wl2_test_surface.c' + 'ecore_wl2_test_input.c' ] ecore_wl2_suite = executable('ecore_wl2_suite', --
