summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Zaoui <daniel.zaoui@yahoo.com>2016-11-20 09:22:08 +0200
committerDaniel Zaoui <daniel.zaoui@yahoo.com>2016-11-20 09:22:10 +0200
commit18d27683faf0278f2b12d03e4c42b47e4c573ea2 (patch)
tree6e3537950b76e9918c0e7f31ba48563588d97c41
parent3857b1cde06c9a9fe4391d854ddb65c24137ef34 (diff)
Tests/Elm_Code: fix access to test files
Test files were not installed.
-rw-r--r--src/Makefile_Elementary.am13
-rw-r--r--src/bin/elementary/test_code.c4
2 files changed, 10 insertions, 7 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 7679950ca5..3686dcb487 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -1219,12 +1219,15 @@ edje_external_elementary_module_la_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
1219edje_external_elementary_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 1219edje_external_elementary_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
1220edje_external_elementary_module_la_LIBTOOLFLAGS = --tag=disable-static 1220edje_external_elementary_module_la_LIBTOOLFLAGS = --tag=disable-static
1221 1221
1222testfilesdir = $(datadir)/elementary/
1223testfiles_DATA = \
1224 tests/elementary/testfile.txt \
1225 tests/elementary/testfile-windows.txt \
1226 tests/elementary/testfile-withblanks.txt \
1227 tests/elementary/testdiff.diff
1228
1222### Tests 1229### Tests
1223EXTRA_DIST2 += \ 1230EXTRA_DIST2 += $(testfiles_DATA)
1224tests/elementary/testfile.txt \
1225tests/elementary/testfile-windows.txt \
1226tests/elementary/testfile-withblanks.txt \
1227tests/elementary/testdiff.diff
1228 1231
1229if EFL_ENABLE_TESTS 1232if EFL_ENABLE_TESTS
1230 1233
diff --git a/src/bin/elementary/test_code.c b/src/bin/elementary/test_code.c
index 9f615b5cc0..4f3408a082 100644
--- a/src/bin/elementary/test_code.c
+++ b/src/bin/elementary/test_code.c
@@ -138,7 +138,7 @@ _elm_code_test_diff_inline_setup(Evas_Object *parent)
138 evas_object_show(diff); 138 evas_object_show(diff);
139 139
140 elm_code_parser_standard_add(code, ELM_CODE_PARSER_STANDARD_DIFF); 140 elm_code_parser_standard_add(code, ELM_CODE_PARSER_STANDARD_DIFF);
141 elm_code_file_open(code, PACKAGE_DATA_DIR "testdiff.diff"); 141 elm_code_file_open(code, PACKAGE_DATA_DIR "/testdiff.diff");
142 142
143 return diff; 143 return diff;
144} 144}
@@ -150,7 +150,7 @@ _elm_code_test_diff_setup(Evas_Object *parent)
150 Elm_Code *code; 150 Elm_Code *code;
151 151
152 code = elm_code_create(); 152 code = elm_code_create();
153 elm_code_file_open(code, PACKAGE_DATA_DIR "testdiff.diff"); 153 elm_code_file_open(code, PACKAGE_DATA_DIR "/testdiff.diff");
154 154
155 diff = elm_code_diff_widget_add(parent, code); 155 diff = elm_code_diff_widget_add(parent, code);
156 return diff; 156 return diff;