From 27430928acaec8fd74a7ff67920ca0383f868502 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Fri, 30 Nov 2018 14:35:51 +0100 Subject: [PATCH] eolian_aux: rename tests classes to avoid autotools conflict Having these files would result in eolian cxx tests failing when building using autotools, as eolian generators by default include entire src directory and eolian cxx already had classes a/b/c. In an ideal case this should not happen as eolian cxx should not scan tests that are not its own, and it already behaves correctly under meson but there is no good way to fix it for autotools, so just rename as a workaround. --- src/tests/eolian/data_aux/{a.eo => aux_a.eo} | 6 ++--- src/tests/eolian/data_aux/aux_b.eo | 2 ++ src/tests/eolian/data_aux/{c.eo => aux_c.eo} | 2 +- src/tests/eolian/data_aux/b.eo | 2 -- src/tests/eolian/eolian_aux.c | 26 ++++++++++---------- 5 files changed, 19 insertions(+), 19 deletions(-) rename src/tests/eolian/data_aux/{a.eo => aux_a.eo} (62%) create mode 100644 src/tests/eolian/data_aux/aux_b.eo rename src/tests/eolian/data_aux/{c.eo => aux_c.eo} (86%) delete mode 100644 src/tests/eolian/data_aux/b.eo diff --git a/src/tests/eolian/data_aux/a.eo b/src/tests/eolian/data_aux/aux_a.eo similarity index 62% rename from src/tests/eolian/data_aux/a.eo rename to src/tests/eolian/data_aux/aux_a.eo index f610fcb998..2ff081f9d8 100644 --- a/src/tests/eolian/data_aux/a.eo +++ b/src/tests/eolian/data_aux/aux_a.eo @@ -1,4 +1,4 @@ -class A(C) { +class Aux_A(Aux_C) { methods { baz {} } @@ -6,7 +6,7 @@ class A(C) { test2: void; } implements { - C.foo; - C.bar; + Aux_C.foo; + Aux_C.bar; } } diff --git a/src/tests/eolian/data_aux/aux_b.eo b/src/tests/eolian/data_aux/aux_b.eo new file mode 100644 index 0000000000..4c225d3c18 --- /dev/null +++ b/src/tests/eolian/data_aux/aux_b.eo @@ -0,0 +1,2 @@ +class Aux_B(Aux_C) { +} diff --git a/src/tests/eolian/data_aux/c.eo b/src/tests/eolian/data_aux/aux_c.eo similarity index 86% rename from src/tests/eolian/data_aux/c.eo rename to src/tests/eolian/data_aux/aux_c.eo index 999c5cda38..7e67ed547d 100644 --- a/src/tests/eolian/data_aux/c.eo +++ b/src/tests/eolian/data_aux/aux_c.eo @@ -1,4 +1,4 @@ -class C { +class Aux_C { methods { foo {} bar {} diff --git a/src/tests/eolian/data_aux/b.eo b/src/tests/eolian/data_aux/b.eo deleted file mode 100644 index 3b00c23308..0000000000 --- a/src/tests/eolian/data_aux/b.eo +++ /dev/null @@ -1,2 +0,0 @@ -class B(C) { -} diff --git a/src/tests/eolian/eolian_aux.c b/src/tests/eolian/eolian_aux.c index b7f263f483..10f562b301 100644 --- a/src/tests/eolian/eolian_aux.c +++ b/src/tests/eolian/eolian_aux.c @@ -11,19 +11,19 @@ EFL_START_TEST(eolian_aux_children) Eolian_State *eos = eolian_state_new(); fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data_aux")); - fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/a.eo")); - fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/b.eo")); + fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/aux_a.eo")); + fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/aux_b.eo")); Eina_Hash *chash = eolian_aux_state_class_children_find(eos); fail_if(!chash); - const Eolian_Class *acl = eolian_state_class_by_name_get(eos, "A"); + const Eolian_Class *acl = eolian_state_class_by_name_get(eos, "Aux_A"); fail_if(!acl); - const Eolian_Class *bcl = eolian_state_class_by_name_get(eos, "B"); + const Eolian_Class *bcl = eolian_state_class_by_name_get(eos, "Aux_B"); fail_if(!bcl); - const Eolian_Class *ccl = eolian_state_class_by_name_get(eos, "C"); + const Eolian_Class *ccl = eolian_state_class_by_name_get(eos, "Aux_C"); fail_if(!ccl); Eina_List *cl = eina_hash_find(chash, &ccl); @@ -48,13 +48,13 @@ EFL_START_TEST(eolian_aux_implements) Eolian_State *eos = eolian_state_new(); fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data_aux")); - fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/a.eo")); - fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/b.eo")); + fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/aux_a.eo")); + fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/aux_b.eo")); Eina_Hash *chash = eolian_aux_state_class_children_find(eos); fail_if(!chash); - const Eolian_Class *ccl = eolian_state_class_by_name_get(eos, "C"); + const Eolian_Class *ccl = eolian_state_class_by_name_get(eos, "Aux_C"); fail_if(!ccl); const Eolian_Function *fn = eolian_class_function_by_name_get(ccl, "foo", EOLIAN_METHOD); @@ -75,9 +75,9 @@ EFL_START_TEST(eolian_aux_callables) Eolian_State *eos = eolian_state_new(); fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data_aux")); - fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/a.eo")); + fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/aux_a.eo")); - const Eolian_Class *acl = eolian_state_class_by_name_get(eos, "A"); + const Eolian_Class *acl = eolian_state_class_by_name_get(eos, "Aux_A"); fail_if(!acl); Eina_List *funcs = NULL; @@ -103,12 +103,12 @@ EFL_START_TEST(eolian_aux_implparent) Eolian_State *eos = eolian_state_new(); fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data_aux")); - fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/a.eo")); + fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/aux_a.eo")); - const Eolian_Class *acl = eolian_state_class_by_name_get(eos, "A"); + const Eolian_Class *acl = eolian_state_class_by_name_get(eos, "Aux_A"); fail_if(!acl); - const Eolian_Class *ccl = eolian_state_class_by_name_get(eos, "C"); + const Eolian_Class *ccl = eolian_state_class_by_name_get(eos, "Aux_C"); fail_if(!ccl); const Eolian_Function *fn = eolian_class_function_by_name_get(ccl, "foo", EOLIAN_METHOD);