diff options
author | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
commit | c963d75dfdeec11f82e79e727062fbf89afa2c04 (patch) | |
tree | 895633dbf641110be46f117c29890c49b3ffc0bd /libraries/ecore/src/tests | |
parent | Adding the new extantz viewer and grid manager. (diff) | |
download | SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.zip SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.gz SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.bz2 SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.xz |
Update EFL to latest beta.
Diffstat (limited to '')
-rw-r--r-- | libraries/ecore/src/tests/Makefile.in | 20 | ||||
-rw-r--r-- | libraries/ecore/src/tests/ecore_test_ecore_x.c | 4 |
2 files changed, 16 insertions, 8 deletions
diff --git a/libraries/ecore/src/tests/Makefile.in b/libraries/ecore/src/tests/Makefile.in index bd7726a..aa799d9 100644 --- a/libraries/ecore/src/tests/Makefile.in +++ b/libraries/ecore/src/tests/Makefile.in | |||
@@ -53,16 +53,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_attribute.m4 \ | |||
53 | $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \ | 53 | $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \ |
54 | $(top_srcdir)/m4/efl_threads.m4 $(top_srcdir)/m4/gettext.m4 \ | 54 | $(top_srcdir)/m4/efl_threads.m4 $(top_srcdir)/m4/gettext.m4 \ |
55 | $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ | 55 | $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ |
56 | $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \ | 56 | $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ |
57 | $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ | 57 | $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ |
58 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 58 | $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
59 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 59 | $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
60 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ | 60 | $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ |
61 | $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ | 61 | $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac |
62 | $(top_srcdir)/configure.ac | ||
63 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 62 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
64 | $(ACLOCAL_M4) | 63 | $(ACLOCAL_M4) |
65 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 64 | mkinstalldirs = $(install_sh) -d |
66 | CONFIG_HEADER = $(top_builddir)/config.h | 65 | CONFIG_HEADER = $(top_builddir)/config.h |
67 | CONFIG_CLEAN_FILES = | 66 | CONFIG_CLEAN_FILES = |
68 | CONFIG_CLEAN_VPATH_FILES = | 67 | CONFIG_CLEAN_VPATH_FILES = |
@@ -174,6 +173,8 @@ EVAS_LIBS = @EVAS_LIBS@ | |||
174 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 173 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
175 | EVIL_LIBS = @EVIL_LIBS@ | 174 | EVIL_LIBS = @EVIL_LIBS@ |
176 | EXEEXT = @EXEEXT@ | 175 | EXEEXT = @EXEEXT@ |
176 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
177 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
177 | FGREP = @FGREP@ | 178 | FGREP = @FGREP@ |
178 | GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ | 179 | GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ |
179 | GLIB_CFLAGS = @GLIB_CFLAGS@ | 180 | GLIB_CFLAGS = @GLIB_CFLAGS@ |
@@ -229,6 +230,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
229 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 230 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
230 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 231 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
231 | PKG_CONFIG = @PKG_CONFIG@ | 232 | PKG_CONFIG = @PKG_CONFIG@ |
233 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
234 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
232 | POSUB = @POSUB@ | 235 | POSUB = @POSUB@ |
233 | RANLIB = @RANLIB@ | 236 | RANLIB = @RANLIB@ |
234 | SCIM_CFLAGS = @SCIM_CFLAGS@ | 237 | SCIM_CFLAGS = @SCIM_CFLAGS@ |
@@ -239,6 +242,7 @@ SDL_LIBS = @SDL_LIBS@ | |||
239 | SED = @SED@ | 242 | SED = @SED@ |
240 | SET_MAKE = @SET_MAKE@ | 243 | SET_MAKE = @SET_MAKE@ |
241 | SHELL = @SHELL@ | 244 | SHELL = @SHELL@ |
245 | SHM_OPEN_LIBS = @SHM_OPEN_LIBS@ | ||
242 | SSL_CFLAGS = @SSL_CFLAGS@ | 246 | SSL_CFLAGS = @SSL_CFLAGS@ |
243 | SSL_LIBS = @SSL_LIBS@ | 247 | SSL_LIBS = @SSL_LIBS@ |
244 | STRIP = @STRIP@ | 248 | STRIP = @STRIP@ |
diff --git a/libraries/ecore/src/tests/ecore_test_ecore_x.c b/libraries/ecore/src/tests/ecore_test_ecore_x.c index 4b9e126..2d14ff1 100644 --- a/libraries/ecore/src/tests/ecore_test_ecore_x.c +++ b/libraries/ecore/src/tests/ecore_test_ecore_x.c | |||
@@ -6,6 +6,10 @@ | |||
6 | 6 | ||
7 | #include "ecore_suite.h" | 7 | #include "ecore_suite.h" |
8 | 8 | ||
9 | /* FIXME: Currently disable these tests. They are useless ATM and they just | ||
10 | * make buildbot complain. Once we add useful tests here we'll also bother | ||
11 | * with getting X on the server. */ | ||
12 | #undef HAVE_ECORE_X_XLIB | ||
9 | 13 | ||
10 | /* TODO: change to HAVE_ECORE_X when xcb implementation is done */ | 14 | /* TODO: change to HAVE_ECORE_X when xcb implementation is done */ |
11 | #ifdef HAVE_ECORE_X_XLIB | 15 | #ifdef HAVE_ECORE_X_XLIB |