orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Evas filters: Fix make doc, check when EFL is not installed 

Thanks @aerodynamik for even giving the proper environment
variable to set :)

Fixes T2614
This commit is contained in:
Jean-Philippe Andre 2015-07-29 20:00:35 +09:00
parent 1f758ad96d
commit b8a2a9b3c0
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/previews/Makefile.am
View File

@ -55,7 +55,7 @@ previews-data: preview_text_filter
if [ -e ${top_srcdir}/doc/previews/filter_$${a}.sh ] ; then \ if [ -e ${top_srcdir}/doc/previews/filter_$${a}.sh ] ; then \
source ${top_srcdir}/doc/previews/filter_$${a}.sh ; \ source ${top_srcdir}/doc/previews/filter_$${a}.sh ; \
fi ; \ fi ; \
$(top_builddir)/doc/previews/preview_text_filter "$${TEXT}" "$${FILTER}" "$(DATADIR)/filter_$${a}.png" "$${FONT}" "$${SIZE}" ; \ EVAS_DATA_DIR="$(top_srcdir)/src/lib/evas" $(top_builddir)/doc/previews/preview_text_filter "$${TEXT}" "$${FILTER}" "$(DATADIR)/filter_$${a}.png" "$${FONT}" "$${SIZE}" ; \
cp "$(DATADIR)/filter_$${a}.png" "$(HTMLDIR)/" ; \ cp "$(DATADIR)/filter_$${a}.png" "$(HTMLDIR)/" ; \
done done

1
src/Makefile_Edje.am
View File

@ -278,6 +278,7 @@ tests/edje/edje_suite.h
tests_edje_edje_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ tests_edje_edje_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
$(EDJE_COMMON_CPPFLAGS) \ $(EDJE_COMMON_CPPFLAGS) \
-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/edje\" \
-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/edje\" \ -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/edje\" \
@CHECK_CFLAGS@ @CHECK_CFLAGS@
tests_edje_edje_suite_LDADD = @CHECK_LIBS@ $(USE_EDJE_BIN_LIBS) tests_edje_edje_suite_LDADD = @CHECK_LIBS@ $(USE_EDJE_BIN_LIBS)

4
src/tests/edje/edje_test_edje.c
View File

@ -13,6 +13,8 @@
#include "edje_suite.h" #include "edje_suite.h"
#include "edje_tests_helpers.h" #include "edje_tests_helpers.h"
#define EVAS_DATA_DIR TESTS_SRC_DIR "/../../lib/evas"
START_TEST(edje_test_edje_init) START_TEST(edje_test_edje_init)
{ {
int ret; int ret;
@ -213,6 +215,8 @@ START_TEST(edje_test_filters)
const char *prg, *name; const char *prg, *name;
Eina_Bool b; Eina_Bool b;
setenv("EVAS_DATA_DIR", EVAS_DATA_DIR, 1);
obj = edje_object_add(evas); obj = edje_object_add(evas);
fail_unless(edje_object_file_set(obj, test_layout_get("test_filters.edj"), "test_group")); fail_unless(edje_object_file_set(obj, test_layout_get("test_filters.edj"), "test_group"));

4
src/tests/evas/evas_test_filters.c
View File

@ -17,10 +17,12 @@
#define TEST_FONT_NAME "DejaVuSans,UnDotum" #define TEST_FONT_NAME "DejaVuSans,UnDotum"
#define TEST_FONT_SOURCE TESTS_SRC_DIR "/TestFont.eet" #define TEST_FONT_SOURCE TESTS_SRC_DIR "/TestFont.eet"
#define EVAS_DATA_DIR TESTS_SRC_DIR "/../../lib/evas"
#define START_FILTER_TEST() \ #define START_FILTER_TEST() \
Ecore_Evas *ee; Evas *evas; \ Ecore_Evas *ee; Evas *evas; \
Evas_Object *to; \ Evas_Object *to; \
setenv("EVAS_DATA_DIR", EVAS_DATA_DIR, 1); \
evas_init(); \ evas_init(); \
ecore_evas_init(); \ ecore_evas_init(); \
ee = ecore_evas_buffer_new(1, 1); \ ee = ecore_evas_buffer_new(1, 1); \
@ -67,6 +69,8 @@ START_TEST(evas_filter_parser)
// itself is full featured. Let's just ensure that our main functions exist // itself is full featured. Let's just ensure that our main functions exist
// and that calling them (kinda) works. // and that calling them (kinda) works.
setenv("EVAS_DATA_DIR", EVAS_DATA_DIR, 1);
#define CHECK_FILTER(_a, _v) do { \ #define CHECK_FILTER(_a, _v) do { \
pgm = evas_filter_program_new("evas_suite", EINA_TRUE); \ pgm = evas_filter_program_new("evas_suite", EINA_TRUE); \
if (evas_filter_program_parse(pgm, _a) != _v) \ if (evas_filter_program_parse(pgm, _a) != _v) \