bu5hm4n pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=87a93b852134d8b348d5c3615471e8713748966a

commit 87a93b852134d8b348d5c3615471e8713748966a
Author: Marcel Hollerbach <marcel-hollerb...@t-online.de>
Date:   Thu Dec 21 20:31:39 2017 +0100

    eolian: unify test directories
---
 src/Makefile_Eolian.am               |  3 +-
 src/tests/eolian/eolian_generation.c | 84 +++++++++++++++++-----------------
 src/tests/eolian/eolian_parsing.c    | 88 ++++++++++++++++++------------------
 3 files changed, 87 insertions(+), 88 deletions(-)

diff --git a/src/Makefile_Eolian.am b/src/Makefile_Eolian.am
index efad6a62d4..cd3f824171 100644
--- a/src/Makefile_Eolian.am
+++ b/src/Makefile_Eolian.am
@@ -124,8 +124,7 @@ CLEANFILES += tests/eolian/generated_future.eo.h 
tests/eolian/generated_future.e
 
 tests_eolian_eolian_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl 
-I$(top_builddir)/src/tests/eolian \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eolian\" \
--DPACKAGE_DATA_DIR=\"$(top_srcdir)/src/tests/eolian\" \
--DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eolian\" \
 -DEOLIAN_GEN="\"$(EOLIAN_GEN)\"" \
 @CHECK_CFLAGS@ \
 @EOLIAN_CFLAGS@ @EO_CFLAGS@
diff --git a/src/tests/eolian/eolian_generation.c 
b/src/tests/eolian/eolian_generation.c
index eb9f7d3973..785d73d434 100644
--- a/src/tests/eolian/eolian_generation.c
+++ b/src/tests/eolian/eolian_generation.c
@@ -85,7 +85,7 @@ _eolian_gen_execute(const char *eo_filename, const char 
*options, const char *ou
 {
    char command[PATH_MAX];
    snprintf(command, PATH_MAX,
-         EOLIAN_GEN" %s -S -I \""PACKAGE_DATA_DIR"/data\" -o %s %s",
+         EOLIAN_GEN" %s -S -I \""TESTS_SRC_DIR"/data\" -o %s %s",
          options, output_filename, eo_filename);
    return system(command);
 }
@@ -96,13 +96,13 @@ START_TEST(eolian_dev_impl_code)
    snprintf(output_filepath, PATH_MAX, "%s/eolian_object_impl",
             eina_environment_tmp_get());
    _remove_ref(output_filepath, "c");
-   fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/object_impl.eo", 
"-gi", output_filepath));
-   fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/object_impl_ref.c", 
output_filepath, "c"));
+   fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/object_impl.eo", 
"-gi", output_filepath));
+   fail_if(!_files_compare(TESTS_SRC_DIR"/data/object_impl_ref.c", 
output_filepath, "c"));
    /* Check that nothing is added */
-   fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/object_impl.eo", 
"-gi", output_filepath));
-   fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/object_impl_ref.c", 
output_filepath, "c"));
-   fail_if(0 != 
_eolian_gen_execute(PACKAGE_DATA_DIR"/data/object_impl_add.eo", "-gi", 
output_filepath));
-   fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/object_impl_add_ref.c", 
output_filepath, "c"));
+   fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/object_impl.eo", 
"-gi", output_filepath));
+   fail_if(!_files_compare(TESTS_SRC_DIR"/data/object_impl_ref.c", 
output_filepath, "c"));
+   fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/object_impl_add.eo", 
"-gi", output_filepath));
+   fail_if(!_files_compare(TESTS_SRC_DIR"/data/object_impl_add_ref.c", 
output_filepath, "c"));
 }
 END_TEST
 
@@ -113,15 +113,15 @@ START_TEST(eolian_types_generation)
             eina_environment_tmp_get());
    _remove_ref(output_filepath, "eo.h");
    _remove_ref(output_filepath, "eo.stub.h");
-   fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/typedef.eo", "-gh", 
output_filepath));
-   fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/typedef_ref.h", 
output_filepath, "eo.h"));
-   fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/struct.eo", "-gh", 
output_filepath));
-   fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/struct_ref.h", 
output_filepath, "eo.h"));
-
-   fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/typedef.eo", "-gs", 
output_filepath));
-   fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/typedef_ref_stub.h", 
output_filepath, "eo.stub.h"));
-   fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/struct.eo", "-gs", 
output_filepath));
-   fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/struct_ref_stub.h", 
output_filepath, "eo.stub.h"));
+   fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/typedef.eo", "-gh", 
output_filepath));
+   fail_if(!_files_compare(TESTS_SRC_DIR"/data/typedef_ref.h", 
output_filepath, "eo.h"));
+   fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/struct.eo", "-gh", 
output_filepath));
+   fail_if(!_files_compare(TESTS_SRC_DIR"/data/struct_ref.h", output_filepath, 
"eo.h"));
+
+   fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/typedef.eo", "-gs", 
output_filepath));
+   fail_if(!_files_compare(TESTS_SRC_DIR"/data/typedef_ref_stub.h", 
output_filepath, "eo.stub.h"));
+   fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/struct.eo", "-gs", 
output_filepath));
+   fail_if(!_files_compare(TESTS_SRC_DIR"/data/struct_ref_stub.h", 
output_filepath, "eo.stub.h"));
 }
 END_TEST
 
@@ -131,8 +131,8 @@ START_TEST(eolian_default_values_generation)
    snprintf(output_filepath, PATH_MAX, "%s/eolian_class_simple",
             eina_environment_tmp_get());
    _remove_ref(output_filepath, "eo.c");
-   fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/class_simple.eo", 
"-gc", output_filepath));
-   fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/class_simple_ref.c", 
output_filepath, "eo.c"));
+   fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/class_simple.eo", 
"-gc", output_filepath));
+   fail_if(!_files_compare(TESTS_SRC_DIR"/data/class_simple_ref.c", 
output_filepath, "eo.c"));
 }
 END_TEST
 
@@ -142,8 +142,8 @@ START_TEST(eolian_override_generation)
    snprintf(output_filepath, PATH_MAX, "%s/eolian_override",
             eina_environment_tmp_get());
    _remove_ref(output_filepath, "eo.c");
-   fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/override.eo", 
"-gc", output_filepath));
-   fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/override_ref.c", 
output_filepath, "eo.c"));
+   fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/override.eo", "-gc", 
output_filepath));
+   fail_if(!_files_compare(TESTS_SRC_DIR"/data/override_ref.c", 
output_filepath, "eo.c"));
 }
 END_TEST
 
@@ -153,11 +153,11 @@ START_TEST(eolian_functions_descriptions)
    snprintf(output_filepath, PATH_MAX, "%s/eolian_class_simple",
             eina_environment_tmp_get());
    _remove_ref(output_filepath, "eo.h");
-   fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/class_simple.eo", 
"-gh", output_filepath));
-   fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/class_simple_ref_eo.h", 
output_filepath, "eo.h"));
+   fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/class_simple.eo", 
"-gh", output_filepath));
+   fail_if(!_files_compare(TESTS_SRC_DIR"/data/class_simple_ref_eo.h", 
output_filepath, "eo.h"));
    _remove_ref(output_filepath, "eo.legacy.h");
-   fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/class_simple.eo", 
"-gl", output_filepath));
-   fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/class_simple_ref_legacy.h", 
output_filepath, "eo.legacy.h"));
+   fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/class_simple.eo", 
"-gl", output_filepath));
+   fail_if(!_files_compare(TESTS_SRC_DIR"/data/class_simple_ref_legacy.h", 
output_filepath, "eo.legacy.h"));
 }
 END_TEST
 
@@ -167,8 +167,8 @@ START_TEST(eolian_import)
    snprintf(output_filepath, PATH_MAX, "%s/eolian_import_types",
             eina_environment_tmp_get());
    _remove_ref(output_filepath, "eot.h");
-   fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/import_types.eot", 
"-gh", output_filepath));
-   fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/import_types_ref.h", 
output_filepath, "eot.h"));
+   fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/import_types.eot", 
"-gh", output_filepath));
+   fail_if(!_files_compare(TESTS_SRC_DIR"/data/import_types_ref.h", 
output_filepath, "eot.h"));
 }
 END_TEST
 
@@ -178,11 +178,11 @@ START_TEST(eolian_docs)
    snprintf(output_filepath, PATH_MAX, "%s/eolian_docs",
             eina_environment_tmp_get());
    _remove_ref(output_filepath, "eo.h");
-   fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/docs.eo", "-gh", 
output_filepath));
-   fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/docs_ref.h", 
output_filepath, "eo.h"));
+   fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/docs.eo", "-gh", 
output_filepath));
+   fail_if(!_files_compare(TESTS_SRC_DIR"/data/docs_ref.h", output_filepath, 
"eo.h"));
    _remove_ref(output_filepath, "eo.legacy.h");
-   fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/docs.eo", "-gl", 
output_filepath));
-   fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/docs_ref_legacy.h", 
output_filepath, "eo.legacy.h"));
+   fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/docs.eo", "-gl", 
output_filepath));
+   fail_if(!_files_compare(TESTS_SRC_DIR"/data/docs_ref_legacy.h", 
output_filepath, "eo.legacy.h"));
 }
 END_TEST
 
@@ -194,26 +194,26 @@ START_TEST(eolian_function_pointers)
    snprintf(output_filepath, PATH_MAX, "%s/eolian_function_pointers",
             eina_environment_tmp_get());
    _remove_ref(output_filepath, "eot.h");
-   fail_if(0 != 
_eolian_gen_execute(PACKAGE_DATA_DIR"/data/function_types.eot", "-gh", 
output_filepath));
-   fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/function_types_ref.h", 
output_filepath, "eot.h"));
+   fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/function_types.eot", 
"-gh", output_filepath));
+   fail_if(!_files_compare(TESTS_SRC_DIR"/data/function_types_ref.h", 
output_filepath, "eot.h"));
 
    // .eo.h
    _remove_ref(output_filepath, "eo.h");
-   fail_if(0 != 
_eolian_gen_execute(PACKAGE_DATA_DIR"/data/function_as_argument.eo", "-gh", 
output_filepath));
-   fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/function_as_argument_ref.h", 
output_filepath, "eo.h"));
+   fail_if(0 != 
_eolian_gen_execute(TESTS_SRC_DIR"/data/function_as_argument.eo", "-gh", 
output_filepath));
+   fail_if(!_files_compare(TESTS_SRC_DIR"/data/function_as_argument_ref.h", 
output_filepath, "eo.h"));
 
    // .eo.c
    _remove_ref(output_filepath, "eo.c");
-   fail_if(0 != 
_eolian_gen_execute(PACKAGE_DATA_DIR"/data/function_as_argument.eo", "-gc", 
output_filepath));
-   fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/function_as_argument_ref.c", 
output_filepath, "eo.c"));
+   fail_if(0 != 
_eolian_gen_execute(TESTS_SRC_DIR"/data/function_as_argument.eo", "-gc", 
output_filepath));
+   fail_if(!_files_compare(TESTS_SRC_DIR"/data/function_as_argument_ref.c", 
output_filepath, "eo.c"));
 
    // .eo.imp.c
    _remove_ref(output_filepath, "c");
-   fail_if(0 != 
_eolian_gen_execute(PACKAGE_DATA_DIR"/data/function_as_argument.eo", "-gi", 
output_filepath));
-   
fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/function_as_argument_impl_ref.c",
 output_filepath, "c"));
+   fail_if(0 != 
_eolian_gen_execute(TESTS_SRC_DIR"/data/function_as_argument.eo", "-gi", 
output_filepath));
+   
fail_if(!_files_compare(TESTS_SRC_DIR"/data/function_as_argument_impl_ref.c", 
output_filepath, "c"));
    /* Check that nothing is added */
-   fail_if(0 != 
_eolian_gen_execute(PACKAGE_DATA_DIR"/data/function_as_argument.eo", "-gi", 
output_filepath));
-   
fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/function_as_argument_impl_ref.c",
 output_filepath, "c"));
+   fail_if(0 != 
_eolian_gen_execute(TESTS_SRC_DIR"/data/function_as_argument.eo", "-gi", 
output_filepath));
+   
fail_if(!_files_compare(TESTS_SRC_DIR"/data/function_as_argument_impl_ref.c", 
output_filepath, "c"));
 }
 END_TEST
 
@@ -223,8 +223,8 @@ START_TEST(owning)
    snprintf(output_filepath, PATH_MAX, "%s/eolian_owning",
             eina_environment_tmp_get());
    _remove_ref(output_filepath, "eo.c");
-   fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/owning.eo", "-gc", 
output_filepath));
-   fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/owning.eo.c", 
output_filepath, "eo.c"));
+   fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/owning.eo", "-gc", 
output_filepath));
+   fail_if(!_files_compare(TESTS_SRC_DIR"/data/owning.eo.c", output_filepath, 
"eo.c"));
 
 }
 END_TEST
diff --git a/src/tests/eolian/eolian_parsing.c 
b/src/tests/eolian/eolian_parsing.c
index f1b443049d..8227a568f9 100644
--- a/src/tests/eolian/eolian_parsing.c
+++ b/src/tests/eolian/eolian_parsing.c
@@ -25,8 +25,8 @@ START_TEST(eolian_namespaces)
    eolian_init();
    Eolian *eos = eolian_new();
    /* Parsing */
-   fail_if(!eolian_directory_scan(eos, PACKAGE_DATA_DIR"/data"));
-   fail_if(!(unit = eolian_file_parse(eos, 
PACKAGE_DATA_DIR"/data/nmsp1_class1.eo")));
+   fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
+   fail_if(!(unit = eolian_file_parse(eos, 
TESTS_SRC_DIR"/data/nmsp1_class1.eo")));
 
    /* Classes existence  */
    fail_if(!(class11 = eolian_class_get_by_name(unit, "nmsp1.class1")));
@@ -108,8 +108,8 @@ START_TEST(eolian_events)
    eolian_init();
    Eolian *eos = eolian_new();
    /* Parsing */
-   fail_if(!eolian_directory_scan(eos, PACKAGE_DATA_DIR"/data"));
-   fail_if(!(unit = eolian_file_parse(eos, 
PACKAGE_DATA_DIR"/data/events.eo")));
+   fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
+   fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/events.eo")));
 
    /* Class */
    fail_if(!(class = eolian_class_get_by_name(unit, "Events")));
@@ -183,8 +183,8 @@ START_TEST(eolian_override)
    eolian_init();
    Eolian *eos = eolian_new();
    /* Parsing */
-   fail_if(!eolian_directory_scan(eos, PACKAGE_DATA_DIR"/data"));
-   fail_if(!(unit = eolian_file_parse(eos, 
PACKAGE_DATA_DIR"/data/override.eo")));
+   fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
+   fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/override.eo")));
 
    /* Class */
    fail_if(!(class = eolian_class_get_by_name(unit, "Override")));
@@ -240,8 +240,8 @@ START_TEST(eolian_consts)
    eolian_init();
    Eolian *eos = eolian_new();
    /* Parsing */
-   fail_if(!eolian_directory_scan(eos, PACKAGE_DATA_DIR"/data"));
-   fail_if(!(unit = eolian_file_parse(eos, 
PACKAGE_DATA_DIR"/data/consts.eo")));
+   fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
+   fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/consts.eo")));
    fail_if(!(class = eolian_class_get_by_name(unit, "Consts")));
 
    /* Method */
@@ -267,8 +267,8 @@ START_TEST(eolian_ctor_dtor)
    eolian_init();
    Eolian *eos = eolian_new();
    /* Parsing */
-   fail_if(!eolian_directory_scan(eos, PACKAGE_DATA_DIR"/data"));
-   fail_if(!(unit = eolian_file_parse(eos, 
PACKAGE_DATA_DIR"/data/ctor_dtor.eo")));
+   fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
+   fail_if(!(unit = eolian_file_parse(eos, 
TESTS_SRC_DIR"/data/ctor_dtor.eo")));
    fail_if(!(class = eolian_class_get_by_name(unit, "Ctor_Dtor")));
    fail_if(!(base = eolian_class_get_by_name(unit, "Base")));
 
@@ -336,8 +336,8 @@ START_TEST(eolian_typedef)
    eolian_init();
    Eolian *eos = eolian_new();
    /* Parsing */
-   fail_if(!eolian_directory_scan(eos, PACKAGE_DATA_DIR"/data"));
-   fail_if(!(unit = eolian_file_parse(eos, 
PACKAGE_DATA_DIR"/data/typedef.eo")));
+   fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
+   fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/typedef.eo")));
 
    /* Check that the class Dummy is still readable */
    fail_if(!(class = eolian_class_get_by_name(unit, "Typedef")));
@@ -421,8 +421,8 @@ START_TEST(eolian_complex_type)
    eolian_init();
    Eolian *eos = eolian_new();
    /* Parsing */
-   fail_if(!eolian_directory_scan(eos, PACKAGE_DATA_DIR"/data"));
-   fail_if(!(unit = eolian_file_parse(eos, 
PACKAGE_DATA_DIR"/data/complex_type.eo")));
+   fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
+   fail_if(!(unit = eolian_file_parse(eos, 
TESTS_SRC_DIR"/data/complex_type.eo")));
    fail_if(!(class = eolian_class_get_by_name(unit, "Complex_Type")));
 
    /* Properties return type */
@@ -505,8 +505,8 @@ START_TEST(eolian_scope)
    eolian_init();
    Eolian *eos = eolian_new();
    /* Parsing */
-   fail_if(!eolian_directory_scan(eos, PACKAGE_DATA_DIR"/data"));
-   fail_if(!(unit = eolian_file_parse(eos, PACKAGE_DATA_DIR"/data/scope.eo")));
+   fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
+   fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/scope.eo")));
    fail_if(!(class = eolian_class_get_by_name(unit, "Scope")));
 
    /* Property scope */
@@ -548,8 +548,8 @@ START_TEST(eolian_simple_parsing)
    eolian_init();
    Eolian *eos = eolian_new();
    /* Parsing */
-   fail_if(!eolian_directory_scan(eos, PACKAGE_DATA_DIR"/data"));
-   fail_if(!(unit = eolian_file_parse(eos, 
PACKAGE_DATA_DIR"/data/class_simple.eo")));
+   fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
+   fail_if(!(unit = eolian_file_parse(eos, 
TESTS_SRC_DIR"/data/class_simple.eo")));
    fail_if(!(class = eolian_class_get_by_name(unit, "Class_Simple")));
    fail_if(eolian_class_get_by_file(unit, "class_simple.eo") != class);
    fail_if(strcmp(eolian_class_file_get(class), "class_simple.eo"));
@@ -686,8 +686,8 @@ START_TEST(eolian_struct)
    Eolian *eos = eolian_new();
 
    /* Parsing */
-   fail_if(!eolian_directory_scan(eos, PACKAGE_DATA_DIR"/data"));
-   fail_if(!(unit = eolian_file_parse(eos, 
PACKAGE_DATA_DIR"/data/struct.eo")));
+   fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
+   fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/struct.eo")));
 
    /* Check that the class Dummy is still readable */
    fail_if(!(class = eolian_class_get_by_name(unit, "Struct")));
@@ -754,8 +754,8 @@ START_TEST(eolian_extern)
    Eolian *eos = eolian_new();
 
    /* Parsing */
-   fail_if(!eolian_directory_scan(eos, PACKAGE_DATA_DIR"/data"));
-   fail_if(!(unit = eolian_file_parse(eos, 
PACKAGE_DATA_DIR"/data/extern.eo")));
+   fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
+   fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/extern.eo")));
 
    /* Check that the class Dummy is still readable */
    fail_if(!(class = eolian_class_get_by_name(unit, "Extern")));
@@ -796,8 +796,8 @@ START_TEST(eolian_var)
    Eolian *eos = eolian_new();
 
    /* Parsing */
-   fail_if(!eolian_directory_scan(eos, PACKAGE_DATA_DIR"/data"));
-   fail_if(!(unit = eolian_file_parse(eos, PACKAGE_DATA_DIR"/data/var.eo")));
+   fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
+   fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/var.eo")));
 
    /* Check that the class Dummy is still readable */
    fail_if(!(class = eolian_class_get_by_name(unit, "Var")));
@@ -867,8 +867,8 @@ START_TEST(eolian_enum)
    Eolian *eos = eolian_new();
 
    /* Parsing */
-   fail_if(!eolian_directory_scan(eos, PACKAGE_DATA_DIR"/data"));
-   fail_if(!(unit = eolian_file_parse(eos, PACKAGE_DATA_DIR"/data/enum.eo")));
+   fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
+   fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/enum.eo")));
 
    /* Check that the class Dummy is still readable */
    fail_if(!(class = eolian_class_get_by_name(unit, "Enum")));
@@ -963,8 +963,8 @@ START_TEST(eolian_class_funcs)
    eolian_init();
    Eolian *eos = eolian_new();
    /* Parsing */
-   fail_if(!eolian_directory_scan(eos, PACKAGE_DATA_DIR"/data"));
-   fail_if(!(unit = eolian_file_parse(eos, 
PACKAGE_DATA_DIR"/data/class_funcs.eo")));
+   fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
+   fail_if(!(unit = eolian_file_parse(eos, 
TESTS_SRC_DIR"/data/class_funcs.eo")));
    fail_if(!(class = eolian_class_get_by_name(unit, "Class_Funcs")));
 
    /* Class properties */
@@ -1004,8 +1004,8 @@ START_TEST(eolian_free_func)
    Eolian *eos = eolian_new();
 
    /* Parsing */
-   fail_if(!eolian_directory_scan(eos, PACKAGE_DATA_DIR"/data"));
-   fail_if(!(unit = eolian_file_parse(eos, 
PACKAGE_DATA_DIR"/data/free_func.eo")));
+   fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
+   fail_if(!(unit = eolian_file_parse(eos, 
TESTS_SRC_DIR"/data/free_func.eo")));
 
    /* Check that the class Dummy is still readable */
    fail_if(!(class = eolian_class_get_by_name(unit, "Free_Func")));
@@ -1054,8 +1054,8 @@ START_TEST(eolian_null)
    Eolian *eos = eolian_new();
 
    /* Parsing */
-   fail_if(!eolian_directory_scan(eos, PACKAGE_DATA_DIR"/data"));
-   fail_if(!(unit = eolian_file_parse(eos, PACKAGE_DATA_DIR"/data/null.eo")));
+   fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
+   fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/null.eo")));
 
    fail_if(!(class = eolian_class_get_by_name(unit, "Null")));
    fail_if(!(func = eolian_class_function_get_by_name(class, "foo", 
EOLIAN_METHOD)));
@@ -1103,9 +1103,9 @@ START_TEST(eolian_import)
    eolian_init();
    Eolian *eos = eolian_new();
 
-   fail_if(!eolian_directory_scan(eos, PACKAGE_DATA_DIR"/data"));
+   fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
 
-   fail_if(!(unit = eolian_file_parse(eos, 
PACKAGE_DATA_DIR"/data/import.eo")));
+   fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/import.eo")));
    fail_if(!(class = eolian_class_get_by_name(unit, "Import")));
 
    fail_if(!(tdl = eolian_typedecl_alias_get_by_name(unit, "Imported")));
@@ -1131,9 +1131,9 @@ START_TEST(eolian_decl)
    eolian_init();
    Eolian *eos = eolian_new();
 
-   fail_if(!eolian_directory_scan(eos, PACKAGE_DATA_DIR"/data"));
+   fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
 
-   fail_if(!(unit = eolian_file_parse(eos, PACKAGE_DATA_DIR"/data/decl.eo")));
+   fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/decl.eo")));
    fail_if(!(class = eolian_class_get_by_name(unit, "Decl")));
 
    fail_if(!(itr = eolian_declarations_get_by_file(eos, "decl.eo")));
@@ -1200,9 +1200,9 @@ START_TEST(eolian_docs)
    eolian_init();
    Eolian *eos = eolian_new();
 
-   fail_if(!eolian_directory_scan(eos, PACKAGE_DATA_DIR"/data"));
+   fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
 
-   fail_if(!(unit = eolian_file_parse(eos, PACKAGE_DATA_DIR"/data/docs.eo")));
+   fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/docs.eo")));
 
    fail_if(!(tdl = eolian_typedecl_struct_get_by_name(unit, "Foo")));
    fail_if(!(doc = eolian_typedecl_documentation_get(tdl)));
@@ -1444,10 +1444,10 @@ START_TEST(eolian_function_types)
    eolian_init();
    Eolian *eos = eolian_new();
 
-   fail_if(!eolian_directory_scan(eos, PACKAGE_DATA_DIR"/data"));
+   fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
 
    /* Parsing */
-   fail_if(!(unit = eolian_file_parse(eos, 
PACKAGE_DATA_DIR"/data/function_types.eot")));
+   fail_if(!(unit = eolian_file_parse(eos, 
TESTS_SRC_DIR"/data/function_types.eot")));
 
    /* void func(void); */
    fail_if(!(decl = eolian_typedecl_alias_get_by_name(unit, "VoidFunc")));
@@ -1572,9 +1572,9 @@ START_TEST(eolian_function_as_arguments)
    eolian_init();
    Eolian *eos = eolian_new();
 
-   fail_if(!eolian_directory_scan(eos, PACKAGE_DATA_DIR"/data"));
+   fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
 
-   fail_if(!(unit = eolian_file_parse(eos, 
PACKAGE_DATA_DIR"/data/function_as_argument.eo")));
+   fail_if(!(unit = eolian_file_parse(eos, 
TESTS_SRC_DIR"/data/function_as_argument.eo")));
 
    fail_if(!(cls = eolian_class_get_by_name(unit, "Function_As_Argument")));
 
@@ -1614,9 +1614,9 @@ START_TEST(eolian_parts)
    eolian_init();
    Eolian *eos = eolian_new();
 
-   fail_if(!eolian_directory_scan(eos, PACKAGE_DATA_DIR"/data"));
+   fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
 
-   fail_if(!(unit = eolian_file_parse(eos, PACKAGE_DATA_DIR"/data/parts.eo")));
+   fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/parts.eo")));
 
    fail_if(!(cls = eolian_class_get_by_name(unit, "Parts")));
 

-- 


Reply via email to