From 9028fb5ac26e95a9a5dbd88b72f22f78f5edd39b Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 10 Jul 2018 14:44:44 -0400 Subject: [PATCH] tests/ecore: remove ecore-drm test Summary: this caused DSO linker issues when enabled and was only testing init+shutdown for a deprecated component which has not been actively developed in some time Reviewers: devilhorns, ManMower, bu5hm4n Reviewed By: devilhorns, ManMower Subscribers: bu5hm4n, ManMower, cedric, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D6539 --- src/Makefile_Ecore.am | 10 ----- src/tests/ecore/ecore_suite.c | 3 -- src/tests/ecore/ecore_suite.h | 1 - src/tests/ecore/ecore_test_ecore_drm.c | 51 -------------------------- 4 files changed, 65 deletions(-) delete mode 100644 src/tests/ecore/ecore_test_ecore_drm.c diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am index c919187ab3..a33c8f8d9b 100644 --- a/src/Makefile_Ecore.am +++ b/src/Makefile_Ecore.am @@ -300,7 +300,6 @@ tests_ecore_ecore_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ @ECORE_EVAS_CFLAGS@ \ @ECORE_WAYLAND_CFLAGS@ \ @ECORE_WAYLAND_SRV_CFLAGS@ \ -@ECORE_DRM_CFLAGS@ \ @ECORE_FB_CFLAGS@ \ @ECORE_INPUT_CFLAGS@ @@ -315,7 +314,6 @@ tests_ecore_ecore_suite_LDADD = \ @USE_ECORE_WAYLAND_LIBS@ \ @USE_ECORE_FB_LIBS@ \ @ECORE_WAYLAND_SRV_LIBS@ \ -@ECORE_DRM_LIBS@ \ @USE_ECORE_INPUT_LIBS@ tests_ecore_ecore_suite_DEPENDENCIES = \ @USE_ECORE_INTERNAL_LIBS@ \ @@ -325,7 +323,6 @@ tests_ecore_ecore_suite_DEPENDENCIES = \ @USE_ECORE_IMF_INTERNAL_LIBS@ \ @USE_ECORE_EVAS_INTERNAL_LIBS@ \ @USE_ECORE_WAYLAND_INTERNAL_LIBS@ \ -@USE_ECORE_DRM_INTERNAL_LIBS@ \ @USE_ECORE_FB_INTERNAL_LIBS@ \ @USE_ECORE_INPUT_INTERNAL_LIBS@ @@ -349,7 +346,6 @@ tests_ecore_efl_app_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ @ECORE_EVAS_CFLAGS@ \ @ECORE_WAYLAND_CFLAGS@ \ @ECORE_WAYLAND_SRV_CFLAGS@ \ -@ECORE_DRM_CFLAGS@ \ @ECORE_FB_CFLAGS@ \ @ECORE_INPUT_CFLAGS@ @@ -364,7 +360,6 @@ tests_ecore_efl_app_suite_LDADD = \ @USE_ECORE_WAYLAND_LIBS@ \ @USE_ECORE_FB_LIBS@ \ @ECORE_WAYLAND_SRV_LIBS@ \ -@ECORE_DRM_LIBS@ \ @USE_ECORE_INPUT_LIBS@ tests_ecore_efl_app_suite_DEPENDENCIES = \ @USE_ECORE_INTERNAL_LIBS@ \ @@ -374,7 +369,6 @@ tests_ecore_efl_app_suite_DEPENDENCIES = \ @USE_ECORE_IMF_INTERNAL_LIBS@ \ @USE_ECORE_EVAS_INTERNAL_LIBS@ \ @USE_ECORE_WAYLAND_INTERNAL_LIBS@ \ -@USE_ECORE_DRM_INTERNAL_LIBS@ \ @USE_ECORE_FB_INTERNAL_LIBS@ \ @USE_ECORE_INPUT_INTERNAL_LIBS@ @@ -386,10 +380,6 @@ if HAVE_ECORE_AUDIO tests_ecore_ecore_suite_SOURCES += tests/ecore/ecore_test_ecore_audio.c endif -if HAVE_ECORE_DRM -tests_ecore_ecore_suite_SOURCES += tests/ecore/ecore_test_ecore_drm.c -endif - if HAVE_ECORE_FB tests_ecore_ecore_suite_SOURCES += tests/ecore/ecore_test_ecore_fb.c endif diff --git a/src/tests/ecore/ecore_suite.c b/src/tests/ecore/ecore_suite.c index a331cbf581..9e6baf6abb 100644 --- a/src/tests/ecore/ecore_suite.c +++ b/src/tests/ecore/ecore_suite.c @@ -22,9 +22,6 @@ static const Efl_Test_Case etc[] = { { "Ecore_Animators", ecore_test_animator }, { "Eina_Thread_Queue", ecore_test_ecore_thread_eina_thread_queue }, { "Eina_Thread_Queue", ecore_test_ecore_thread_eina_thread_queue2 }, -#if HAVE_ECORE_DRM - { "Ecore_Drm", ecore_test_ecore_drm }, -#endif #if HAVE_ECORE_FB { "Ecore_Fb", ecore_test_ecore_fb }, #endif diff --git a/src/tests/ecore/ecore_suite.h b/src/tests/ecore/ecore_suite.h index debc20337e..d1a698ea99 100644 --- a/src/tests/ecore/ecore_suite.h +++ b/src/tests/ecore/ecore_suite.h @@ -17,7 +17,6 @@ void ecore_test_ecore_evas(TCase *tc); void ecore_test_animator(TCase *tc); void ecore_test_ecore_thread_eina_thread_queue(TCase *tc); void ecore_test_ecore_thread_eina_thread_queue2(TCase *tc); -void ecore_test_ecore_drm(TCase *tc); void ecore_test_ecore_fb(TCase *tc); void ecore_test_ecore_input(TCase *tc); void ecore_test_ecore_file(TCase *tc); diff --git a/src/tests/ecore/ecore_test_ecore_drm.c b/src/tests/ecore/ecore_test_ecore_drm.c deleted file mode 100644 index 709b775b89..0000000000 --- a/src/tests/ecore/ecore_test_ecore_drm.c +++ /dev/null @@ -1,51 +0,0 @@ -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include - -#include - -#include "ecore_suite.h" - -#define MAX_ITER 10 - -EFL_START_TEST(ecore_test_ecore_drm_shutdown_bef_init) -{ - int ret = 0; - - ret = ecore_drm_shutdown(); - fail_if(ret != 0); - - ret = ecore_drm_init(); - fail_if(ret != 1); - - ret = ecore_drm_shutdown(); - fail_if(ret != 0); -} -EFL_END_TEST - -EFL_START_TEST(ecore_test_ecore_drm_init) -{ - int ret, i, j; - - for (i = 1; i <= MAX_ITER; i++) - { - ret = ecore_drm_init(); - fail_if(ret != i); - } - - for (j = MAX_ITER - 1; j >= 0; j--) - { - ret = ecore_drm_shutdown(); - fail_if(ret != j); - } -} -EFL_END_TEST - -void ecore_test_ecore_drm(TCase *tc) -{ - tcase_add_test(tc, ecore_test_ecore_drm_init); - tcase_add_test(tc, ecore_test_ecore_drm_shutdown_bef_init); -}