From 36867e14a291ba5bd0961692aa3f9883c08a2f74 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 11 Jul 2007 15:17:30 +0000 Subject: [PATCH] - remove ecore_desktop comparison tests SVN revision: 30767 --- legacy/efreet/configure.in | 21 --------- legacy/efreet/src/bin/compare/Makefile.am | 14 ------ .../efreet/src/bin/compare/compare_results.c | 43 ------------------- legacy/efreet/src/bin/compare/ecore_alloc.c | 29 ------------- 4 files changed, 107 deletions(-) delete mode 100644 legacy/efreet/src/bin/compare/compare_results.c delete mode 100644 legacy/efreet/src/bin/compare/ecore_alloc.c diff --git a/legacy/efreet/configure.in b/legacy/efreet/configure.in index 67ed7c6086..c3d19934bc 100644 --- a/legacy/efreet/configure.in +++ b/legacy/efreet/configure.in @@ -24,27 +24,6 @@ CFLAGS=$ECORE_CFLAGS" "$CFLAGS requirements="ecore ecore-file" -AC_ARG_ENABLE(ecore-desktop, - [AC_HELP_STRING([--enable-ecore-desktop],[Enable Ecore_Desktop tests])], - [enable_ecore_desktop=$enableval], [enable_ecore_desktop="auto"]) - -have_ecore_desktop=no - -if test "x$enable_ecore_desktop" != "xno" ; then - PKG_CHECK_MODULES(ECORE_DESKTOP, [ecore-desktop >= 0.9.9], [ - have_ecore_desktop=yes - ], [ - have_ecore_desktop=no - ]) -fi - -if test "x$have_ecore_desktop" = "xyes" ; then - AC_DEFINE(ENABLE_ECORE_DESKTOP, 1, [Enable Ecore_Desktop]) -elif test "x$enable_ecore_desktop" = "xyes" ; then - AC_MSG_ERROR(No Ecore_Desktop found disabling comparison tests.) -fi -AM_CONDITIONAL(HAVE_ECORE_DESKTOP, test "x$have_ecore_desktop" = xyes) - AC_ARG_ENABLE(strict-spec, [AC_HELP_STRING([--enable-strict-spec],[Enable strict spec compliance])], [enable_strict_spec=$enableval], [enable_strict_spec="auto"]) diff --git a/legacy/efreet/src/bin/compare/Makefile.am b/legacy/efreet/src/bin/compare/Makefile.am index 6e2e6bc873..bdd493cdab 100644 --- a/legacy/efreet/src/bin/compare/Makefile.am +++ b/legacy/efreet/src/bin/compare/Makefile.am @@ -3,11 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in INCLUDES = \ -I. -I$(top_srcdir)/src/lib @ECORE_CFLAGS@ -if HAVE_ECORE_DESKTOP -bin_PROGRAMS = efreet_alloc ecore_alloc compare_results efreet_menu_alloc -else bin_PROGRAMS = efreet_alloc efreet_menu_alloc -endif efreet_menu_alloc_DEPENDENCIES = $(top_builddir)/src/lib/libefreet.la efreet_menu_alloc_SOURCES = efreet_menu_alloc.c comp.h @@ -17,13 +13,3 @@ efreet_alloc_DEPENDENCIES = $(top_builddir)/src/lib/libefreet.la efreet_alloc_SOURCES = efreet_alloc.c comp.h efreet_alloc_LDADD = $(top_builddir)/src/lib/libefreet.la @ECORE_LIBS@ -if HAVE_ECORE_DESKTOP -ecore_alloc_DEPENDENCIES = -ecore_alloc_SOURCES = ecore_alloc.c comp.h -ecore_alloc_LDADD = @ECORE_LIBS@ @ECORE_DESKTOP_LIBS@ - -compare_results_DEPENDENCIES = $(top_builddir)/src/lib/libefreet.la -compare_results_SOURCES = compare_results.c comp.h -compare_results_LDADD = $(top_builddir)/src/lib/libefreet.la @ECORE_LIBS@ @ECORE_DESKTOP_LIBS@ -endif - diff --git a/legacy/efreet/src/bin/compare/compare_results.c b/legacy/efreet/src/bin/compare/compare_results.c deleted file mode 100644 index 471034354f..0000000000 --- a/legacy/efreet/src/bin/compare/compare_results.c +++ /dev/null @@ -1,43 +0,0 @@ -#include -#include -#include -#include -#include -#include "comp.h" - -int -main(int argc, char ** argv) -{ - int i; - const char *ef, *ed; - - ecore_init(); - ecore_desktop_init(); - efreet_init(); - - efreet_icon_extension_add(".svg"); - - for (i = 0; icons[i] != NULL; i++) - { - ef = efreet_icon_path_find(THEME, icons[i], SIZE); - ed = ecore_desktop_icon_find(icons[i], SIZE, THEME); - - if (!ef && !ed) continue; - - if (!ef && ed) - printf("%s matched ecore (%s) but not efreet\n", icons[i], ed); - - else if (ef && !ed) - printf("%s matched efreet (%s) but not ecore\n", icons[i], ef); - - else if (strcmp(ef, ed)) - printf("%s didn't match ef(%s) vs ed(%s)\n", icons[i], ef, ed); - } - - efreet_shutdown(); - ecore_desktop_shutdown(); - ecore_shutdown(); - - return 0; -} - diff --git a/legacy/efreet/src/bin/compare/ecore_alloc.c b/legacy/efreet/src/bin/compare/ecore_alloc.c deleted file mode 100644 index b94731a05d..0000000000 --- a/legacy/efreet/src/bin/compare/ecore_alloc.c +++ /dev/null @@ -1,29 +0,0 @@ -#include -#include -#include -#include "comp.h" - -int -main(int argc, char ** argv) -{ - int i = 0, k; - const char *path; - - ecore_init(); - ecore_desktop_init(); - - for (k = 0; k < LOOPS; k++) - { - for (i = 0; icons[i] != NULL; i++) - { - path = ecore_desktop_icon_find(icons[i], SIZE, THEME); -// printf("%s: %s\n", icons[i], (path ? path : "NOT FOUND")); - } - } - - ecore_desktop_shutdown(); - ecore_shutdown(); - - return 0; -} -