From 18d27683faf0278f2b12d03e4c42b47e4c573ea2 Mon Sep 17 00:00:00 2001 From: Daniel Zaoui Date: Sun, 20 Nov 2016 09:22:08 +0200 Subject: [PATCH] Tests/Elm_Code: fix access to test files Test files were not installed. --- src/Makefile_Elementary.am | 13 ++++++++----- src/bin/elementary/test_code.c | 4 ++-- 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@ edje_external_elementary_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ edje_external_elementary_module_la_LIBTOOLFLAGS = --tag=disable-static +testfilesdir = $(datadir)/elementary/ +testfiles_DATA = \ + tests/elementary/testfile.txt \ + tests/elementary/testfile-windows.txt \ + tests/elementary/testfile-withblanks.txt \ + tests/elementary/testdiff.diff + ### Tests -EXTRA_DIST2 += \ -tests/elementary/testfile.txt \ -tests/elementary/testfile-windows.txt \ -tests/elementary/testfile-withblanks.txt \ -tests/elementary/testdiff.diff +EXTRA_DIST2 += $(testfiles_DATA) if EFL_ENABLE_TESTS 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) evas_object_show(diff); elm_code_parser_standard_add(code, ELM_CODE_PARSER_STANDARD_DIFF); - elm_code_file_open(code, PACKAGE_DATA_DIR "testdiff.diff"); + elm_code_file_open(code, PACKAGE_DATA_DIR "/testdiff.diff"); return diff; } @@ -150,7 +150,7 @@ _elm_code_test_diff_setup(Evas_Object *parent) Elm_Code *code; code = elm_code_create(); - elm_code_file_open(code, PACKAGE_DATA_DIR "testdiff.diff"); + elm_code_file_open(code, PACKAGE_DATA_DIR "/testdiff.diff"); diff = elm_code_diff_widget_add(parent, code); return diff;