jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b8a2a9b3c023d159d11243654fcd33c1b31e55fb
commit b8a2a9b3c023d159d11243654fcd33c1b31e55fb
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Wed Jul 29 20:00:35 2015 +0900
Evas filters: Fix make doc, check when EFL is not installed
Thanks @aerodynamik for even giving the proper environment
variable to set :)
Fixes T2614
---
doc/previews/Makefile.am | 2 +-
src/Makefile_Edje.am | 1 +
src/tests/edje/edje_test_edje.c | 4 ++++
src/tests/evas/evas_test_filters.c | 4 ++++
4 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/doc/previews/Makefile.am b/doc/previews/Makefile.am
index f7c405b..ba952dd 100644
--- a/doc/previews/Makefile.am
+++ b/doc/previews/Makefile.am
@@ -55,7 +55,7 @@ previews-data: preview_text_filter
if [ -e ${top_srcdir}/doc/previews/filter_$${a}.sh ] ; then \
source ${top_srcdir}/doc/previews/filter_$${a}.sh ; \
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)/" ; \
done
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 3b4c79b..6675d6d 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -278,6 +278,7 @@ tests/edje/edje_suite.h
tests_edje_edje_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
$(EDJE_COMMON_CPPFLAGS) \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/edje\" \
-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/edje\" \
@CHECK_CFLAGS@
tests_edje_edje_suite_LDADD = @CHECK_LIBS@ $(USE_EDJE_BIN_LIBS)
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index d68a5d9..bf32f6d 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -13,6 +13,8 @@
#include "edje_suite.h"
#include "edje_tests_helpers.h"
+#define EVAS_DATA_DIR TESTS_SRC_DIR "/../../lib/evas"
+
START_TEST(edje_test_edje_init)
{
int ret;
@@ -213,6 +215,8 @@ START_TEST(edje_test_filters)
const char *prg, *name;
Eina_Bool b;
+ setenv("EVAS_DATA_DIR", EVAS_DATA_DIR, 1);
+
obj = edje_object_add(evas);
fail_unless(edje_object_file_set(obj, test_layout_get("test_filters.edj"),
"test_group"));
diff --git a/src/tests/evas/evas_test_filters.c
b/src/tests/evas/evas_test_filters.c
index 82d73e5..ea27256 100644
--- a/src/tests/evas/evas_test_filters.c
+++ b/src/tests/evas/evas_test_filters.c
@@ -17,10 +17,12 @@
#define TEST_FONT_NAME "DejaVuSans,UnDotum"
#define TEST_FONT_SOURCE TESTS_SRC_DIR "/TestFont.eet"
+#define EVAS_DATA_DIR TESTS_SRC_DIR "/../../lib/evas"
#define START_FILTER_TEST() \
Ecore_Evas *ee; Evas *evas; \
Evas_Object *to; \
+ setenv("EVAS_DATA_DIR", EVAS_DATA_DIR, 1); \
evas_init(); \
ecore_evas_init(); \
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
// and that calling them (kinda) works.
+ setenv("EVAS_DATA_DIR", EVAS_DATA_DIR, 1);
+
#define CHECK_FILTER(_a, _v) do { \
pgm = evas_filter_program_new("evas_suite", EINA_TRUE); \
if (evas_filter_program_parse(pgm, _a) != _v) \
--
