summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2018-11-30 14:35:51 +0100
committerDaniel Kolesa <d.kolesa@samsung.com>2018-11-30 14:35:51 +0100
commit27430928acaec8fd74a7ff67920ca0383f868502 (patch)
tree51584b2ead70639a3986b8b70b29cb7164f66c86
parent454e9eb1d9f480583850aaaa6d8ee72045763b28 (diff)
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.
-rw-r--r--src/tests/eolian/data_aux/aux_a.eo (renamed from src/tests/eolian/data_aux/a.eo)6
-rw-r--r--src/tests/eolian/data_aux/aux_b.eo2
-rw-r--r--src/tests/eolian/data_aux/aux_c.eo (renamed from src/tests/eolian/data_aux/c.eo)2
-rw-r--r--src/tests/eolian/data_aux/b.eo2
-rw-r--r--src/tests/eolian/eolian_aux.c26
5 files changed, 19 insertions, 19 deletions
diff --git a/src/tests/eolian/data_aux/a.eo b/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 @@
1class A(C) { 1class Aux_A(Aux_C) {
2 methods { 2 methods {
3 baz {} 3 baz {}
4 } 4 }
@@ -6,7 +6,7 @@ class A(C) {
6 test2: void; 6 test2: void;
7 } 7 }
8 implements { 8 implements {
9 C.foo; 9 Aux_C.foo;
10 C.bar; 10 Aux_C.bar;
11 } 11 }
12} 12}
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 @@
1class Aux_B(Aux_C) {
2}
diff --git a/src/tests/eolian/data_aux/c.eo b/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 @@
1class C { 1class Aux_C {
2 methods { 2 methods {
3 foo {} 3 foo {}
4 bar {} 4 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 @@
1class B(C) {
2}
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)
11 Eolian_State *eos = eolian_state_new(); 11 Eolian_State *eos = eolian_state_new();
12 12
13 fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data_aux")); 13 fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data_aux"));
14 fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/a.eo")); 14 fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/aux_a.eo"));
15 fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/b.eo")); 15 fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/aux_b.eo"));
16 16
17 Eina_Hash *chash = eolian_aux_state_class_children_find(eos); 17 Eina_Hash *chash = eolian_aux_state_class_children_find(eos);
18 fail_if(!chash); 18 fail_if(!chash);
19 19
20 const Eolian_Class *acl = eolian_state_class_by_name_get(eos, "A"); 20 const Eolian_Class *acl = eolian_state_class_by_name_get(eos, "Aux_A");
21 fail_if(!acl); 21 fail_if(!acl);
22 22
23 const Eolian_Class *bcl = eolian_state_class_by_name_get(eos, "B"); 23 const Eolian_Class *bcl = eolian_state_class_by_name_get(eos, "Aux_B");
24 fail_if(!bcl); 24 fail_if(!bcl);
25 25
26 const Eolian_Class *ccl = eolian_state_class_by_name_get(eos, "C"); 26 const Eolian_Class *ccl = eolian_state_class_by_name_get(eos, "Aux_C");
27 fail_if(!ccl); 27 fail_if(!ccl);
28 28
29 Eina_List *cl = eina_hash_find(chash, &ccl); 29 Eina_List *cl = eina_hash_find(chash, &ccl);
@@ -48,13 +48,13 @@ EFL_START_TEST(eolian_aux_implements)
48 Eolian_State *eos = eolian_state_new(); 48 Eolian_State *eos = eolian_state_new();
49 49
50 fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data_aux")); 50 fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data_aux"));
51 fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/a.eo")); 51 fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/aux_a.eo"));
52 fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/b.eo")); 52 fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/aux_b.eo"));
53 53
54 Eina_Hash *chash = eolian_aux_state_class_children_find(eos); 54 Eina_Hash *chash = eolian_aux_state_class_children_find(eos);
55 fail_if(!chash); 55 fail_if(!chash);
56 56
57 const Eolian_Class *ccl = eolian_state_class_by_name_get(eos, "C"); 57 const Eolian_Class *ccl = eolian_state_class_by_name_get(eos, "Aux_C");
58 fail_if(!ccl); 58 fail_if(!ccl);
59 59
60 const Eolian_Function *fn = eolian_class_function_by_name_get(ccl, "foo", EOLIAN_METHOD); 60 const Eolian_Function *fn = eolian_class_function_by_name_get(ccl, "foo", EOLIAN_METHOD);
@@ -75,9 +75,9 @@ EFL_START_TEST(eolian_aux_callables)
75 Eolian_State *eos = eolian_state_new(); 75 Eolian_State *eos = eolian_state_new();
76 76
77 fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data_aux")); 77 fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data_aux"));
78 fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/a.eo")); 78 fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/aux_a.eo"));
79 79
80 const Eolian_Class *acl = eolian_state_class_by_name_get(eos, "A"); 80 const Eolian_Class *acl = eolian_state_class_by_name_get(eos, "Aux_A");
81 fail_if(!acl); 81 fail_if(!acl);
82 82
83 Eina_List *funcs = NULL; 83 Eina_List *funcs = NULL;
@@ -103,12 +103,12 @@ EFL_START_TEST(eolian_aux_implparent)
103 Eolian_State *eos = eolian_state_new(); 103 Eolian_State *eos = eolian_state_new();
104 104
105 fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data_aux")); 105 fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data_aux"));
106 fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/a.eo")); 106 fail_if(!eolian_state_file_parse(eos, TESTS_SRC_DIR"/data_aux/aux_a.eo"));
107 107
108 const Eolian_Class *acl = eolian_state_class_by_name_get(eos, "A"); 108 const Eolian_Class *acl = eolian_state_class_by_name_get(eos, "Aux_A");
109 fail_if(!acl); 109 fail_if(!acl);
110 110
111 const Eolian_Class *ccl = eolian_state_class_by_name_get(eos, "C"); 111 const Eolian_Class *ccl = eolian_state_class_by_name_get(eos, "Aux_C");
112 fail_if(!ccl); 112 fail_if(!ccl);
113 113
114 const Eolian_Function *fn = eolian_class_function_by_name_get(ccl, "foo", EOLIAN_METHOD); 114 const Eolian_Function *fn = eolian_class_function_by_name_get(ccl, "foo", EOLIAN_METHOD);