kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Daniel Kolesa 2018-11-30 14:35:51 +01:00
parent 454e9eb1d9
commit 27430928ac
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tests/eolian/data_aux/a.eo → src/tests/eolian/data_aux/aux_a.eo
View File

@ -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;
}
}

2
src/tests/eolian/data_aux/aux_b.eo Normal file
View File

@ -0,0 +1,2 @@
class Aux_B(Aux_C) {
}

2
src/tests/eolian/data_aux/c.eo → src/tests/eolian/data_aux/aux_c.eo
View File

@ -1,4 +1,4 @@
class C {
class Aux_C {
methods {
foo {}
bar {}

2
src/tests/eolian/data_aux/b.eo
View File

@ -1,2 +0,0 @@
class B(C) {
}

26
src/tests/eolian/eolian_aux.c
View File

@ -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);