summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristopher Michael <cp.michael@samsung.com>2019-11-05 09:44:53 -0500
committerChristopher Michael <cp.michael@samsung.com>2019-11-05 09:44:53 -0500
commit4068d1c5be2fe2ed56586243adfca86bbbbf2f30 (patch)
tree754631a8419c4acba2f2ff6b207eff21799de5a0 /src
parent2fe6d593212e09cb3cddfc509ad805d25cb2f926 (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/tests/ecore_wl2/ecore_wl2_suite.c1
-rw-r--r--src/tests/ecore_wl2/ecore_wl2_suite.h1
-rw-r--r--src/tests/ecore_wl2/ecore_wl2_test_surface.c56
-rw-r--r--src/tests/ecore_wl2/meson.build3
4 files changed, 1 insertions, 60 deletions
diff --git a/src/tests/ecore_wl2/ecore_wl2_suite.c b/src/tests/ecore_wl2/ecore_wl2_suite.c
index 623d601..b6875c0 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[] =
13 { "Display", ecore_wl2_test_display }, 13 { "Display", ecore_wl2_test_display },
14 { "Window", ecore_wl2_test_window }, 14 { "Window", ecore_wl2_test_window },
15 { "Input", ecore_wl2_test_input }, 15 { "Input", ecore_wl2_test_input },
16 { "Surface", ecore_wl2_test_surface },
17#endif 16#endif
18 { NULL, NULL } 17 { NULL, NULL }
19}; 18};
diff --git a/src/tests/ecore_wl2/ecore_wl2_suite.h b/src/tests/ecore_wl2/ecore_wl2_suite.h
index ce0e1b4..a8edf93 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);
8void ecore_wl2_test_display(TCase *tc); 8void ecore_wl2_test_display(TCase *tc);
9void ecore_wl2_test_window(TCase *tc); 9void ecore_wl2_test_window(TCase *tc);
10void ecore_wl2_test_input(TCase *tc); 10void ecore_wl2_test_input(TCase *tc);
11void ecore_wl2_test_surface(TCase *tc);
12 11
13#endif 12#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 f4252e1..0000000
--- a/src/tests/ecore_wl2/ecore_wl2_test_surface.c
+++ /dev/null
@@ -1,56 +0,0 @@
1#ifdef HAVE_CONFIG_H
2# include "config.h"
3#endif
4
5#include <stdio.h>
6#include <unistd.h>
7#include <Eina.h>
8#include <Ecore.h>
9#include <Ecore_Wl2.h>
10
11#include "ecore_wl2_suite.h"
12
13static Ecore_Wl2_Display *
14_display_connect(void)
15{
16 Ecore_Wl2_Display *disp;
17
18 disp = ecore_wl2_display_connect(NULL);
19 return disp;
20}
21
22static Ecore_Wl2_Window *
23_window_create(Ecore_Wl2_Display *disp)
24{
25 Ecore_Wl2_Window *win;
26
27 win = ecore_wl2_window_new(disp, NULL, 100, 100, 500, 500);
28 return win;
29}
30
31EFL_START_TEST(wl2_surface_create)
32{
33 Ecore_Wl2_Display *disp;
34 Ecore_Wl2_Window *win;
35 Ecore_Wl2_Surface *surf;
36
37 disp = _display_connect();
38 ck_assert(disp != NULL);
39
40 win = _window_create(disp);
41 ck_assert(win != NULL);
42
43 surf = ecore_wl2_surface_create(win, EINA_FALSE);
44 ck_assert(surf != NULL);
45}
46EFL_END_TEST
47
48void
49ecore_wl2_test_surface(TCase *tc)
50{
51 if (getenv("WAYLAND_DISPLAY"))
52 {
53 /* surface tests can only run if there is an existing compositor */
54 tcase_add_test(tc, wl2_surface_create);
55 }
56}
diff --git a/src/tests/ecore_wl2/meson.build b/src/tests/ecore_wl2/meson.build
index c1d37cb..eb1a13d 100644
--- a/src/tests/ecore_wl2/meson.build
+++ b/src/tests/ecore_wl2/meson.build
@@ -5,8 +5,7 @@ ecore_wl2_suite_src = [
5 'ecore_wl2_test_ecore_wl2.c', 5 'ecore_wl2_test_ecore_wl2.c',
6 'ecore_wl2_test_display.c', 6 'ecore_wl2_test_display.c',
7 'ecore_wl2_test_window.c', 7 'ecore_wl2_test_window.c',
8 'ecore_wl2_test_input.c', 8 'ecore_wl2_test_input.c'
9 'ecore_wl2_test_surface.c'
10] 9]
11 10
12ecore_wl2_suite = executable('ecore_wl2_suite', 11ecore_wl2_suite = executable('ecore_wl2_suite',