summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-09-07 21:56:44 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-09-07 21:56:44 +0000
commit312066e91b9064f529f297d8d34e1924f92f6656 (patch)
tree84a85f7d46d92c6627eee247c85934554d56307c
parentaf81f7b38c158a850fc03f4236aff0f9ae8471a3 (diff)
Eo: add autotools tests. I have plenty of errors with the unit tests on Windows
SVN revision: 76323
-rw-r--r--legacy/eobj/Makefile.am9
-rw-r--r--legacy/eobj/configure.ac11
-rw-r--r--legacy/eobj/m4/efl_tests.m45
-rw-r--r--legacy/eobj/src/Makefile.am2
-rw-r--r--legacy/eobj/src/tests/Makefile.am6
-rw-r--r--legacy/eobj/src/tests/access/Makefile.am20
-rw-r--r--legacy/eobj/src/tests/access/inherit.c6
-rw-r--r--legacy/eobj/src/tests/access/inherit.h2
-rw-r--r--legacy/eobj/src/tests/access/main.c4
-rw-r--r--legacy/eobj/src/tests/access/simple.c4
-rw-r--r--legacy/eobj/src/tests/access/simple.h2
-rw-r--r--legacy/eobj/src/tests/access/simple_protected.h2
-rw-r--r--legacy/eobj/src/tests/composite_objects/Makefile.am19
-rw-r--r--legacy/eobj/src/tests/composite_objects/comp.c6
-rw-r--r--legacy/eobj/src/tests/composite_objects/comp.h2
-rw-r--r--legacy/eobj/src/tests/composite_objects/main.c4
-rw-r--r--legacy/eobj/src/tests/composite_objects/simple.c6
-rw-r--r--legacy/eobj/src/tests/composite_objects/simple.h2
-rw-r--r--legacy/eobj/src/tests/constructors/Makefile.am31
-rw-r--r--legacy/eobj/src/tests/constructors/main.c4
-rw-r--r--legacy/eobj/src/tests/constructors/mixin.c6
-rw-r--r--legacy/eobj/src/tests/constructors/mixin.h2
-rw-r--r--legacy/eobj/src/tests/constructors/simple.c6
-rw-r--r--legacy/eobj/src/tests/constructors/simple.h2
-rw-r--r--legacy/eobj/src/tests/constructors/simple2.c6
-rw-r--r--legacy/eobj/src/tests/constructors/simple2.h2
-rw-r--r--legacy/eobj/src/tests/constructors/simple3.c6
-rw-r--r--legacy/eobj/src/tests/constructors/simple3.h2
-rw-r--r--legacy/eobj/src/tests/constructors/simple4.c4
-rw-r--r--legacy/eobj/src/tests/constructors/simple4.h2
-rw-r--r--legacy/eobj/src/tests/constructors/simple5.c6
-rw-r--r--legacy/eobj/src/tests/constructors/simple5.h2
-rw-r--r--legacy/eobj/src/tests/constructors/simple6.c6
-rw-r--r--legacy/eobj/src/tests/constructors/simple6.h2
-rw-r--r--legacy/eobj/src/tests/constructors/simple7.c5
-rw-r--r--legacy/eobj/src/tests/constructors/simple7.h2
-rw-r--r--legacy/eobj/src/tests/eo_suite/class_simple.c6
-rw-r--r--legacy/eobj/src/tests/eo_suite/class_simple.h2
-rw-r--r--legacy/eobj/src/tests/eo_suite/eo_suite.c1
-rw-r--r--legacy/eobj/src/tests/eo_suite/eo_test_class_errors.c7
-rw-r--r--legacy/eobj/src/tests/eo_suite/eo_test_general.c3
-rw-r--r--legacy/eobj/src/tests/eo_suite/eo_test_init.c2
-rw-r--r--legacy/eobj/src/tests/function_overrides/Makefile.am23
-rw-r--r--legacy/eobj/src/tests/function_overrides/inherit.c5
-rw-r--r--legacy/eobj/src/tests/function_overrides/inherit.h2
-rw-r--r--legacy/eobj/src/tests/function_overrides/inherit2.c7
-rw-r--r--legacy/eobj/src/tests/function_overrides/inherit2.h2
-rw-r--r--legacy/eobj/src/tests/function_overrides/inherit3.c7
-rw-r--r--legacy/eobj/src/tests/function_overrides/inherit3.h2
-rw-r--r--legacy/eobj/src/tests/function_overrides/main.c4
-rw-r--r--legacy/eobj/src/tests/function_overrides/simple.c5
-rw-r--r--legacy/eobj/src/tests/function_overrides/simple.h2
-rw-r--r--legacy/eobj/src/tests/interface/Makefile.am21
-rw-r--r--legacy/eobj/src/tests/interface/interface.c6
-rw-r--r--legacy/eobj/src/tests/interface/interface.h2
-rw-r--r--legacy/eobj/src/tests/interface/interface2.c6
-rw-r--r--legacy/eobj/src/tests/interface/interface2.h2
-rw-r--r--legacy/eobj/src/tests/interface/main.c4
-rw-r--r--legacy/eobj/src/tests/interface/simple.c6
-rw-r--r--legacy/eobj/src/tests/interface/simple.h2
-rw-r--r--legacy/eobj/src/tests/mixin/Makefile.am27
-rw-r--r--legacy/eobj/src/tests/mixin/inherit.c8
-rw-r--r--legacy/eobj/src/tests/mixin/inherit.h4
-rw-r--r--legacy/eobj/src/tests/mixin/main.c4
-rw-r--r--legacy/eobj/src/tests/mixin/mixin.c6
-rw-r--r--legacy/eobj/src/tests/mixin/mixin.h2
-rw-r--r--legacy/eobj/src/tests/mixin/mixin2.c6
-rw-r--r--legacy/eobj/src/tests/mixin/mixin2.h2
-rw-r--r--legacy/eobj/src/tests/mixin/mixin3.c6
-rw-r--r--legacy/eobj/src/tests/mixin/mixin3.h2
-rw-r--r--legacy/eobj/src/tests/mixin/mixin4.c6
-rw-r--r--legacy/eobj/src/tests/mixin/mixin4.h2
-rw-r--r--legacy/eobj/src/tests/mixin/simple.c6
-rw-r--r--legacy/eobj/src/tests/mixin/simple.h2
-rw-r--r--legacy/eobj/src/tests/signals/Makefile.am17
-rw-r--r--legacy/eobj/src/tests/signals/main.c4
-rw-r--r--legacy/eobj/src/tests/signals/simple.c6
-rw-r--r--legacy/eobj/src/tests/signals/simple.h2
78 files changed, 329 insertions, 120 deletions
diff --git a/legacy/eobj/Makefile.am b/legacy/eobj/Makefile.am
index b0afe91904..8455c91649 100644
--- a/legacy/eobj/Makefile.am
+++ b/legacy/eobj/Makefile.am
@@ -52,6 +52,7 @@ doc:
52 52
53if EFL_ENABLE_TESTS 53if EFL_ENABLE_TESTS
54 54
55
55lcov-reset: 56lcov-reset:
56 @rm -rf $(top_builddir)/coverage 57 @rm -rf $(top_builddir)/coverage
57 @find $(top_builddir) -name "*.gcda" -delete 58 @find $(top_builddir) -name "*.gcda" -delete
@@ -65,9 +66,13 @@ lcov-report:
65 @echo "Coverage Report at $(top_builddir)/coverage/html" 66 @echo "Coverage Report at $(top_builddir)/coverage/html"
66 67
67check-local: 68check-local:
69if EFL_ENABLE_COVERAGE
68 @$(MAKE) lcov-reset 70 @$(MAKE) lcov-reset
69 @./src/tests/eina_suite 71endif
72 @./src/tests/eo_suite/eo_suite
73if EFL_ENABLE_COVERAGE
70 @$(MAKE) lcov-report 74 @$(MAKE) lcov-report
75endif
71 76
72else 77else
73 78
@@ -87,7 +92,7 @@ if EFL_ENABLE_BENCHMARK
87benchmark: 92benchmark:
88 @cd src && $(MAKE) benchmark 93 @cd src && $(MAKE) benchmark
89 @mkdir result || true 94 @mkdir result || true
90 @cd result && ../src/tests/eina_bench `date +%F_%s` 95 @cd result && ../src/tests/eo_bench `date +%F_%s`
91 96
92else 97else
93 98
diff --git a/legacy/eobj/configure.ac b/legacy/eobj/configure.ac
index 1c463cdcca..0bdd0c8274 100644
--- a/legacy/eobj/configure.ac
+++ b/legacy/eobj/configure.ac
@@ -158,6 +158,15 @@ src/examples/eo_isa/Makefile
158src/examples/evas/Makefile 158src/examples/evas/Makefile
159src/examples/simple/Makefile 159src/examples/simple/Makefile
160src/lib/Makefile 160src/lib/Makefile
161src/tests/Makefile
162src/tests/access/Makefile
163src/tests/composite_objects/Makefile
164src/tests/constructors/Makefile
165src/tests/eo_suite/Makefile
166src/tests/function_overrides/Makefile
167src/tests/interface/Makefile
168src/tests/mixin/Makefile
169src/tests/signals/Makefile
161]) 170])
162 171
163AC_OUTPUT 172AC_OUTPUT
@@ -176,7 +185,7 @@ echo
176echo "Configuration Options Summary:" 185echo "Configuration Options Summary:"
177echo 186echo
178echo " Documentation........: ${build_doc}" 187echo " Documentation........: ${build_doc}"
179echo " Tests................: ${enable_tests} (Coverage: ${efl_enable_coverage})" 188echo " Unit Tests...........: ${enable_tests} (Coverage: ${efl_enable_coverage})"
180echo " Examples.............: ${enable_build_examples}" 189echo " Examples.............: ${enable_build_examples}"
181echo " Benchmark............: ${enable_benchmark}" 190echo " Benchmark............: ${enable_benchmark}"
182echo 191echo
diff --git a/legacy/eobj/m4/efl_tests.m4 b/legacy/eobj/m4/efl_tests.m4
index d8554e1539..4f87559982 100644
--- a/legacy/eobj/m4/efl_tests.m4
+++ b/legacy/eobj/m4/efl_tests.m4
@@ -37,7 +37,7 @@ if test "x${_efl_enable_tests}" = "xyes" ; then
37 [_efl_enable_tests="no"]) 37 [_efl_enable_tests="no"])
38fi 38fi
39 39
40efl_enable_coverage="no" 40_efl_enable_coverage="no"
41if test "x${_efl_enable_tests}" = "xyes" ; then 41if test "x${_efl_enable_tests}" = "xyes" ; then
42 AC_CHECK_PROG(have_lcov, [lcov], [yes], [no]) 42 AC_CHECK_PROG(have_lcov, [lcov], [yes], [no])
43 if test "x$have_lcov" = "xyes" ; then 43 if test "x$have_lcov" = "xyes" ; then
@@ -49,13 +49,14 @@ if test "x${_efl_enable_tests}" = "xyes" ; then
49 else 49 else
50 m4_defn([UPEFL])[]_CFLAGS="${m4_defn([UPEFL])[]_CFLAGS} -g -O0 -DDEBUG" 50 m4_defn([UPEFL])[]_CFLAGS="${m4_defn([UPEFL])[]_CFLAGS} -g -O0 -DDEBUG"
51 fi 51 fi
52 efl_enable_coverage="yes" 52 _efl_enable_coverage="yes"
53 else 53 else
54 AC_MSG_WARN([lcov is not found, disable profiling instrumentation]) 54 AC_MSG_WARN([lcov is not found, disable profiling instrumentation])
55 fi 55 fi
56fi 56fi
57 57
58AM_CONDITIONAL(EFL_ENABLE_TESTS, test "x${_efl_enable_tests}" = "xyes") 58AM_CONDITIONAL(EFL_ENABLE_TESTS, test "x${_efl_enable_tests}" = "xyes")
59AM_CONDITIONAL(EFL_ENABLE_COVERAGE, test "x${_efl_enable_coverage}" = "xyes")
59 60
60AS_IF([test "x$_efl_enable_tests" = "xyes"], [$2], [$3]) 61AS_IF([test "x$_efl_enable_tests" = "xyes"], [$2], [$3])
61 62
diff --git a/legacy/eobj/src/Makefile.am b/legacy/eobj/src/Makefile.am
index cb86447f7b..849ab4182c 100644
--- a/legacy/eobj/src/Makefile.am
+++ b/legacy/eobj/src/Makefile.am
@@ -1,7 +1,7 @@
1 1
2MAINTAINERCLEANFILES = Makefile.in 2MAINTAINERCLEANFILES = Makefile.in
3 3
4SUBDIRS = lib benchmarks examples 4SUBDIRS = lib benchmarks examples tests
5 5
6.PHONY: benchmark 6.PHONY: benchmark
7 7
diff --git a/legacy/eobj/src/tests/Makefile.am b/legacy/eobj/src/tests/Makefile.am
new file mode 100644
index 0000000000..0afd2fa4ba
--- /dev/null
+++ b/legacy/eobj/src/tests/Makefile.am
@@ -0,0 +1,6 @@
1
2MAINTAINERCLEANFILES = Makefile.in
3
4SUBDIRS = access composite_objects constructors eo_suite function_overrides interface mixin signals
5
6EXTRA_DIST = eunit_tests.h
diff --git a/legacy/eobj/src/tests/access/Makefile.am b/legacy/eobj/src/tests/access/Makefile.am
new file mode 100644
index 0000000000..a6d1475640
--- /dev/null
+++ b/legacy/eobj/src/tests/access/Makefile.am
@@ -0,0 +1,20 @@
1
2MAINTAINERCLEANFILES = Makefile.in
3
4AM_CPPFLAGS = \
5-I$(top_srcdir)/src/lib \
6-I$(top_builddir)/src/lib \
7@EFL_EO_BUILD@ \
8@EO_CFLAGS@
9
10noinst_PROGRAMS = access
11
12access_SOURCES = \
13inherit.c \
14inherit.h \
15main.c \
16simple.c \
17simple.h \
18simple_protected.h
19
20access_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@
diff --git a/legacy/eobj/src/tests/access/inherit.c b/legacy/eobj/src/tests/access/inherit.c
index 8f3fe4b862..2c7d4f0849 100644
--- a/legacy/eobj/src/tests/access/inherit.c
+++ b/legacy/eobj/src/tests/access/inherit.c
@@ -1,11 +1,13 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "simple.h" 6#include "simple.h"
3#include "simple_protected.h" 7#include "simple_protected.h"
4 8
5#include "inherit.h" 9#include "inherit.h"
6 10
7#include "config.h"
8
9EAPI Eo_Op INHERIT_BASE_ID = 0; 11EAPI Eo_Op INHERIT_BASE_ID = 0;
10 12
11#define MY_CLASS INHERIT_CLASS 13#define MY_CLASS INHERIT_CLASS
diff --git a/legacy/eobj/src/tests/access/inherit.h b/legacy/eobj/src/tests/access/inherit.h
index 26fa9d97ae..f701dae484 100644
--- a/legacy/eobj/src/tests/access/inherit.h
+++ b/legacy/eobj/src/tests/access/inherit.h
@@ -1,8 +1,6 @@
1#ifndef INHERIT_H 1#ifndef INHERIT_H
2#define INHERIT_H 2#define INHERIT_H
3 3
4#include "Eo.h"
5
6extern EAPI Eo_Op INHERIT_BASE_ID; 4extern EAPI Eo_Op INHERIT_BASE_ID;
7 5
8enum { 6enum {
diff --git a/legacy/eobj/src/tests/access/main.c b/legacy/eobj/src/tests/access/main.c
index 0cd352ec5f..c211698d83 100644
--- a/legacy/eobj/src/tests/access/main.c
+++ b/legacy/eobj/src/tests/access/main.c
@@ -1,3 +1,7 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "simple.h" 6#include "simple.h"
3#include "inherit.h" 7#include "inherit.h"
diff --git a/legacy/eobj/src/tests/access/simple.c b/legacy/eobj/src/tests/access/simple.c
index 64484be203..ffa66ccb08 100644
--- a/legacy/eobj/src/tests/access/simple.c
+++ b/legacy/eobj/src/tests/access/simple.c
@@ -1,3 +1,7 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "simple.h" 6#include "simple.h"
3#include "simple_protected.h" 7#include "simple_protected.h"
diff --git a/legacy/eobj/src/tests/access/simple.h b/legacy/eobj/src/tests/access/simple.h
index 902d89cabd..11624b7d20 100644
--- a/legacy/eobj/src/tests/access/simple.h
+++ b/legacy/eobj/src/tests/access/simple.h
@@ -1,8 +1,6 @@
1#ifndef SIMPLE_H 1#ifndef SIMPLE_H
2#define SIMPLE_H 2#define SIMPLE_H
3 3
4#include "Eo.h"
5
6extern EAPI Eo_Op SIMPLE_BASE_ID; 4extern EAPI Eo_Op SIMPLE_BASE_ID;
7 5
8enum { 6enum {
diff --git a/legacy/eobj/src/tests/access/simple_protected.h b/legacy/eobj/src/tests/access/simple_protected.h
index ff2fb7e93f..3cabcd804b 100644
--- a/legacy/eobj/src/tests/access/simple_protected.h
+++ b/legacy/eobj/src/tests/access/simple_protected.h
@@ -1,8 +1,6 @@
1#ifndef SIMPLE_PROTECTED_H 1#ifndef SIMPLE_PROTECTED_H
2#define SIMPLE_PROTECTED_H 2#define SIMPLE_PROTECTED_H
3 3
4#include "simple.h"
5
6typedef struct 4typedef struct
7{ 5{
8 Simple_Public_Data public; 6 Simple_Public_Data public;
diff --git a/legacy/eobj/src/tests/composite_objects/Makefile.am b/legacy/eobj/src/tests/composite_objects/Makefile.am
new file mode 100644
index 0000000000..0b37eabc6d
--- /dev/null
+++ b/legacy/eobj/src/tests/composite_objects/Makefile.am
@@ -0,0 +1,19 @@
1
2MAINTAINERCLEANFILES = Makefile.in
3
4AM_CPPFLAGS = \
5-I$(top_srcdir)/src/lib \
6-I$(top_builddir)/src/lib \
7@EFL_EO_BUILD@ \
8@EO_CFLAGS@
9
10noinst_PROGRAMS = composite_objects
11
12composite_objects_SOURCES = \
13comp.c \
14comp.h \
15main.c \
16simple.c \
17simple.h
18
19composite_objects_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@
diff --git a/legacy/eobj/src/tests/composite_objects/comp.c b/legacy/eobj/src/tests/composite_objects/comp.c
index 2c27576c68..f0e5964bfb 100644
--- a/legacy/eobj/src/tests/composite_objects/comp.c
+++ b/legacy/eobj/src/tests/composite_objects/comp.c
@@ -1,8 +1,10 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "simple.h" 6#include "simple.h"
3
4#include "comp.h" 7#include "comp.h"
5#include "config.h"
6 8
7#include "../eunit_tests.h" 9#include "../eunit_tests.h"
8 10
diff --git a/legacy/eobj/src/tests/composite_objects/comp.h b/legacy/eobj/src/tests/composite_objects/comp.h
index 87f61f7488..95001b7020 100644
--- a/legacy/eobj/src/tests/composite_objects/comp.h
+++ b/legacy/eobj/src/tests/composite_objects/comp.h
@@ -1,8 +1,6 @@
1#ifndef COMP_H 1#ifndef COMP_H
2#define COMP_H 2#define COMP_H
3 3
4#include "Eo.h"
5
6#define COMP_CLASS comp_class_get() 4#define COMP_CLASS comp_class_get()
7const Eo_Class *comp_class_get(void); 5const Eo_Class *comp_class_get(void);
8 6
diff --git a/legacy/eobj/src/tests/composite_objects/main.c b/legacy/eobj/src/tests/composite_objects/main.c
index 453f6d2b90..ae5dc5d2f0 100644
--- a/legacy/eobj/src/tests/composite_objects/main.c
+++ b/legacy/eobj/src/tests/composite_objects/main.c
@@ -1,3 +1,7 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "simple.h" 6#include "simple.h"
3#include "comp.h" 7#include "comp.h"
diff --git a/legacy/eobj/src/tests/composite_objects/simple.c b/legacy/eobj/src/tests/composite_objects/simple.c
index 2bd3259f08..070b837b22 100644
--- a/legacy/eobj/src/tests/composite_objects/simple.c
+++ b/legacy/eobj/src/tests/composite_objects/simple.c
@@ -1,8 +1,10 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "simple.h" 6#include "simple.h"
3 7
4#include "config.h"
5
6EAPI Eo_Op SIMPLE_BASE_ID = 0; 8EAPI Eo_Op SIMPLE_BASE_ID = 0;
7 9
8EAPI const Eo_Event_Description _EV_A_CHANGED = 10EAPI const Eo_Event_Description _EV_A_CHANGED =
diff --git a/legacy/eobj/src/tests/composite_objects/simple.h b/legacy/eobj/src/tests/composite_objects/simple.h
index 5d49b59ee1..32a62465b8 100644
--- a/legacy/eobj/src/tests/composite_objects/simple.h
+++ b/legacy/eobj/src/tests/composite_objects/simple.h
@@ -1,8 +1,6 @@
1#ifndef SIMPLE_H 1#ifndef SIMPLE_H
2#define SIMPLE_H 2#define SIMPLE_H
3 3
4#include "Eo.h"
5
6extern EAPI Eo_Op SIMPLE_BASE_ID; 4extern EAPI Eo_Op SIMPLE_BASE_ID;
7 5
8enum { 6enum {
diff --git a/legacy/eobj/src/tests/constructors/Makefile.am b/legacy/eobj/src/tests/constructors/Makefile.am
new file mode 100644
index 0000000000..0d37c60de3
--- /dev/null
+++ b/legacy/eobj/src/tests/constructors/Makefile.am
@@ -0,0 +1,31 @@
1
2MAINTAINERCLEANFILES = Makefile.in
3
4AM_CPPFLAGS = \
5-I$(top_srcdir)/src/lib \
6-I$(top_builddir)/src/lib \
7@EFL_EO_BUILD@ \
8@EO_CFLAGS@
9
10noinst_PROGRAMS = constructors
11
12constructors_SOURCES = \
13main.c \
14mixin.c \
15mixin.h \
16simple.c \
17simple.h \
18simple2.c \
19simple2.h \
20simple3.c \
21simple3.h \
22simple4.c \
23simple4.h \
24simple5.c \
25simple5.h \
26simple6.c \
27simple6.h \
28simple7.c \
29simple7.h
30
31constructors_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@
diff --git a/legacy/eobj/src/tests/constructors/main.c b/legacy/eobj/src/tests/constructors/main.c
index 04d888803f..21bf4b449c 100644
--- a/legacy/eobj/src/tests/constructors/main.c
+++ b/legacy/eobj/src/tests/constructors/main.c
@@ -1,3 +1,7 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "simple.h" 6#include "simple.h"
3#include "simple2.h" 7#include "simple2.h"
diff --git a/legacy/eobj/src/tests/constructors/mixin.c b/legacy/eobj/src/tests/constructors/mixin.c
index 859032928b..9dc1c302a9 100644
--- a/legacy/eobj/src/tests/constructors/mixin.c
+++ b/legacy/eobj/src/tests/constructors/mixin.c
@@ -1,9 +1,11 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "mixin.h" 6#include "mixin.h"
3#include "simple.h" 7#include "simple.h"
4 8
5#include "config.h"
6
7EAPI Eo_Op MIXIN_BASE_ID = 0; 9EAPI Eo_Op MIXIN_BASE_ID = 0;
8 10
9#define MY_CLASS MIXIN_CLASS 11#define MY_CLASS MIXIN_CLASS
diff --git a/legacy/eobj/src/tests/constructors/mixin.h b/legacy/eobj/src/tests/constructors/mixin.h
index 04f587e5ac..9998b274f4 100644
--- a/legacy/eobj/src/tests/constructors/mixin.h
+++ b/legacy/eobj/src/tests/constructors/mixin.h
@@ -1,8 +1,6 @@
1#ifndef MIXIN_H 1#ifndef MIXIN_H
2#define MIXIN_H 2#define MIXIN_H
3 3
4#include "Eo.h"
5
6extern EAPI Eo_Op MIXIN_BASE_ID; 4extern EAPI Eo_Op MIXIN_BASE_ID;
7 5
8enum { 6enum {
diff --git a/legacy/eobj/src/tests/constructors/simple.c b/legacy/eobj/src/tests/constructors/simple.c
index 5712534907..f56828c5b6 100644
--- a/legacy/eobj/src/tests/constructors/simple.c
+++ b/legacy/eobj/src/tests/constructors/simple.c
@@ -1,9 +1,11 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "mixin.h" 6#include "mixin.h"
3#include "simple.h" 7#include "simple.h"
4 8
5#include "config.h"
6
7EAPI Eo_Op SIMPLE_BASE_ID = 0; 9EAPI Eo_Op SIMPLE_BASE_ID = 0;
8 10
9typedef struct 11typedef struct
diff --git a/legacy/eobj/src/tests/constructors/simple.h b/legacy/eobj/src/tests/constructors/simple.h
index ac3e287bbd..7342d3402e 100644
--- a/legacy/eobj/src/tests/constructors/simple.h
+++ b/legacy/eobj/src/tests/constructors/simple.h
@@ -1,8 +1,6 @@
1#ifndef SIMPLE_H 1#ifndef SIMPLE_H
2#define SIMPLE_H 2#define SIMPLE_H
3 3
4#include "Eo.h"
5
6extern EAPI Eo_Op SIMPLE_BASE_ID; 4extern EAPI Eo_Op SIMPLE_BASE_ID;
7 5
8enum { 6enum {
diff --git a/legacy/eobj/src/tests/constructors/simple2.c b/legacy/eobj/src/tests/constructors/simple2.c
index 65c9252585..86c1aeafda 100644
--- a/legacy/eobj/src/tests/constructors/simple2.c
+++ b/legacy/eobj/src/tests/constructors/simple2.c
@@ -1,9 +1,11 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "mixin.h" 6#include "mixin.h"
3#include "simple2.h" 7#include "simple2.h"
4 8
5#include "config.h"
6
7#define MY_CLASS SIMPLE2_CLASS 9#define MY_CLASS SIMPLE2_CLASS
8 10
9static void 11static void
diff --git a/legacy/eobj/src/tests/constructors/simple2.h b/legacy/eobj/src/tests/constructors/simple2.h
index 0857c45a71..e6549f3d2a 100644
--- a/legacy/eobj/src/tests/constructors/simple2.h
+++ b/legacy/eobj/src/tests/constructors/simple2.h
@@ -1,8 +1,6 @@
1#ifndef SIMPLE2_H 1#ifndef SIMPLE2_H
2#define SIMPLE2_H 2#define SIMPLE2_H
3 3
4#include "Eo.h"
5
6#define SIMPLE2_CLASS simple2_class_get() 4#define SIMPLE2_CLASS simple2_class_get()
7const Eo_Class *simple2_class_get(void); 5const Eo_Class *simple2_class_get(void);
8 6
diff --git a/legacy/eobj/src/tests/constructors/simple3.c b/legacy/eobj/src/tests/constructors/simple3.c
index f199cc6ad9..f671b4b24c 100644
--- a/legacy/eobj/src/tests/constructors/simple3.c
+++ b/legacy/eobj/src/tests/constructors/simple3.c
@@ -1,9 +1,11 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "mixin.h" 6#include "mixin.h"
3#include "simple3.h" 7#include "simple3.h"
4 8
5#include "config.h"
6
7#define MY_CLASS SIMPLE3_CLASS 9#define MY_CLASS SIMPLE3_CLASS
8 10
9static void 11static void
diff --git a/legacy/eobj/src/tests/constructors/simple3.h b/legacy/eobj/src/tests/constructors/simple3.h
index dbb3841cc7..e27f8f1ce4 100644
--- a/legacy/eobj/src/tests/constructors/simple3.h
+++ b/legacy/eobj/src/tests/constructors/simple3.h
@@ -1,8 +1,6 @@
1#ifndef SIMPLE3_H 1#ifndef SIMPLE3_H
2#define SIMPLE3_H 2#define SIMPLE3_H
3 3
4#include "Eo.h"
5
6#define SIMPLE3_CLASS simple3_class_get() 4#define SIMPLE3_CLASS simple3_class_get()
7const Eo_Class *simple3_class_get(void); 5const Eo_Class *simple3_class_get(void);
8 6
diff --git a/legacy/eobj/src/tests/constructors/simple4.c b/legacy/eobj/src/tests/constructors/simple4.c
index d2a3dbfa11..95cfa73003 100644
--- a/legacy/eobj/src/tests/constructors/simple4.c
+++ b/legacy/eobj/src/tests/constructors/simple4.c
@@ -1,3 +1,7 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "mixin.h" 6#include "mixin.h"
3#include "simple.h" 7#include "simple.h"
diff --git a/legacy/eobj/src/tests/constructors/simple4.h b/legacy/eobj/src/tests/constructors/simple4.h
index 3e6d1a8d78..fe8e862e6d 100644
--- a/legacy/eobj/src/tests/constructors/simple4.h
+++ b/legacy/eobj/src/tests/constructors/simple4.h
@@ -1,8 +1,6 @@
1#ifndef SIMPLE4_H 1#ifndef SIMPLE4_H
2#define SIMPLE4_H 2#define SIMPLE4_H
3 3
4#include "Eo.h"
5
6#define SIMPLE4_CLASS simple4_class_get() 4#define SIMPLE4_CLASS simple4_class_get()
7const Eo_Class *simple4_class_get(void); 5const Eo_Class *simple4_class_get(void);
8 6
diff --git a/legacy/eobj/src/tests/constructors/simple5.c b/legacy/eobj/src/tests/constructors/simple5.c
index 5fc83782c7..9ff6d49468 100644
--- a/legacy/eobj/src/tests/constructors/simple5.c
+++ b/legacy/eobj/src/tests/constructors/simple5.c
@@ -1,9 +1,11 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "mixin.h" 6#include "mixin.h"
3#include "simple5.h" 7#include "simple5.h"
4 8
5#include "config.h"
6
7#define MY_CLASS SIMPLE5_CLASS 9#define MY_CLASS SIMPLE5_CLASS
8 10
9static void 11static void
diff --git a/legacy/eobj/src/tests/constructors/simple5.h b/legacy/eobj/src/tests/constructors/simple5.h
index 8ae62153a4..9b262d4463 100644
--- a/legacy/eobj/src/tests/constructors/simple5.h
+++ b/legacy/eobj/src/tests/constructors/simple5.h
@@ -1,8 +1,6 @@
1#ifndef SIMPLE5_H 1#ifndef SIMPLE5_H
2#define SIMPLE5_H 2#define SIMPLE5_H
3 3
4#include "Eo.h"
5
6#define SIMPLE5_CLASS simple5_class_get() 4#define SIMPLE5_CLASS simple5_class_get()
7const Eo_Class *simple5_class_get(void); 5const Eo_Class *simple5_class_get(void);
8 6
diff --git a/legacy/eobj/src/tests/constructors/simple6.c b/legacy/eobj/src/tests/constructors/simple6.c
index 2749a8a8d4..7c224d75f2 100644
--- a/legacy/eobj/src/tests/constructors/simple6.c
+++ b/legacy/eobj/src/tests/constructors/simple6.c
@@ -1,9 +1,11 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "mixin.h" 6#include "mixin.h"
3#include "simple6.h" 7#include "simple6.h"
4 8
5#include "config.h"
6
7#define MY_CLASS SIMPLE6_CLASS 9#define MY_CLASS SIMPLE6_CLASS
8 10
9static void 11static void
diff --git a/legacy/eobj/src/tests/constructors/simple6.h b/legacy/eobj/src/tests/constructors/simple6.h
index 32ee3cb01a..97e7b5e360 100644
--- a/legacy/eobj/src/tests/constructors/simple6.h
+++ b/legacy/eobj/src/tests/constructors/simple6.h
@@ -1,8 +1,6 @@
1#ifndef SIMPLE6_H 1#ifndef SIMPLE6_H
2#define SIMPLE6_H 2#define SIMPLE6_H
3 3
4#include "Eo.h"
5
6#define SIMPLE6_CLASS simple6_class_get() 4#define SIMPLE6_CLASS simple6_class_get()
7const Eo_Class *simple6_class_get(void); 5const Eo_Class *simple6_class_get(void);
8 6
diff --git a/legacy/eobj/src/tests/constructors/simple7.c b/legacy/eobj/src/tests/constructors/simple7.c
index ba86e2b478..42af6cf8c2 100644
--- a/legacy/eobj/src/tests/constructors/simple7.c
+++ b/legacy/eobj/src/tests/constructors/simple7.c
@@ -1,9 +1,12 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "mixin.h" 6#include "mixin.h"
3#include "simple7.h" 7#include "simple7.h"
4#include "simple2.h" 8#include "simple2.h"
5 9
6#include "config.h"
7#include "../eunit_tests.h" 10#include "../eunit_tests.h"
8 11
9#define MY_CLASS SIMPLE7_CLASS 12#define MY_CLASS SIMPLE7_CLASS
diff --git a/legacy/eobj/src/tests/constructors/simple7.h b/legacy/eobj/src/tests/constructors/simple7.h
index 3710b62c14..a9a201e447 100644
--- a/legacy/eobj/src/tests/constructors/simple7.h
+++ b/legacy/eobj/src/tests/constructors/simple7.h
@@ -1,8 +1,6 @@
1#ifndef SIMPLE7_H 1#ifndef SIMPLE7_H
2#define SIMPLE7_H 2#define SIMPLE7_H
3 3
4#include "Eo.h"
5
6#define SIMPLE7_CLASS simple7_class_get() 4#define SIMPLE7_CLASS simple7_class_get()
7const Eo_Class *simple7_class_get(void); 5const Eo_Class *simple7_class_get(void);
8 6
diff --git a/legacy/eobj/src/tests/eo_suite/class_simple.c b/legacy/eobj/src/tests/eo_suite/class_simple.c
index e0db709449..bf60a9f149 100644
--- a/legacy/eobj/src/tests/eo_suite/class_simple.c
+++ b/legacy/eobj/src/tests/eo_suite/class_simple.c
@@ -1,8 +1,10 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "class_simple.h" 6#include "class_simple.h"
3 7
4#include "config.h"
5
6#define MY_CLASS SIMPLE_CLASS 8#define MY_CLASS SIMPLE_CLASS
7 9
8EAPI Eo_Op SIMPLE_BASE_ID = 0; 10EAPI Eo_Op SIMPLE_BASE_ID = 0;
diff --git a/legacy/eobj/src/tests/eo_suite/class_simple.h b/legacy/eobj/src/tests/eo_suite/class_simple.h
index eb58f6d93c..9980b7b93a 100644
--- a/legacy/eobj/src/tests/eo_suite/class_simple.h
+++ b/legacy/eobj/src/tests/eo_suite/class_simple.h
@@ -1,8 +1,6 @@
1#ifndef SIMPLE_H 1#ifndef SIMPLE_H
2#define SIMPLE_H 2#define SIMPLE_H
3 3
4#include "Eo.h"
5
6extern EAPI Eo_Op SIMPLE_BASE_ID; 4extern EAPI Eo_Op SIMPLE_BASE_ID;
7 5
8enum { 6enum {
diff --git a/legacy/eobj/src/tests/eo_suite/eo_suite.c b/legacy/eobj/src/tests/eo_suite/eo_suite.c
index 69c3ad7446..0494136cef 100644
--- a/legacy/eobj/src/tests/eo_suite/eo_suite.c
+++ b/legacy/eobj/src/tests/eo_suite/eo_suite.c
@@ -6,7 +6,6 @@
6#include <stdio.h> 6#include <stdio.h>
7 7
8#include "Eo.h" 8#include "Eo.h"
9
10#include "eo_suite.h" 9#include "eo_suite.h"
11 10
12typedef struct _Eo_Test_Case Eo_Test_Case; 11typedef struct _Eo_Test_Case Eo_Test_Case;
diff --git a/legacy/eobj/src/tests/eo_suite/eo_test_class_errors.c b/legacy/eobj/src/tests/eo_suite/eo_test_class_errors.c
index 269c87a7a5..428359f9c3 100644
--- a/legacy/eobj/src/tests/eo_suite/eo_test_class_errors.c
+++ b/legacy/eobj/src/tests/eo_suite/eo_test_class_errors.c
@@ -1,10 +1,11 @@
1#include "config.h" 1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
2 4
3#include <stdio.h> 5#include <stdio.h>
4 6
5#include "eo_suite.h"
6#include "Eo.h" 7#include "Eo.h"
7 8#include "eo_suite.h"
8#include "class_simple.h" 9#include "class_simple.h"
9 10
10START_TEST(eo_incomplete_desc) 11START_TEST(eo_incomplete_desc)
diff --git a/legacy/eobj/src/tests/eo_suite/eo_test_general.c b/legacy/eobj/src/tests/eo_suite/eo_test_general.c
index b1151eb61e..0de71dc0a0 100644
--- a/legacy/eobj/src/tests/eo_suite/eo_test_general.c
+++ b/legacy/eobj/src/tests/eo_suite/eo_test_general.c
@@ -4,9 +4,8 @@
4 4
5#include <stdio.h> 5#include <stdio.h>
6 6
7#include "eo_suite.h"
8#include "Eo.h" 7#include "Eo.h"
9 8#include "eo_suite.h"
10#include "class_simple.h" 9#include "class_simple.h"
11 10
12START_TEST(eo_simple) 11START_TEST(eo_simple)
diff --git a/legacy/eobj/src/tests/eo_suite/eo_test_init.c b/legacy/eobj/src/tests/eo_suite/eo_test_init.c
index 851b857f1a..3bf4b49cb7 100644
--- a/legacy/eobj/src/tests/eo_suite/eo_test_init.c
+++ b/legacy/eobj/src/tests/eo_suite/eo_test_init.c
@@ -4,8 +4,8 @@
4 4
5#include <stdio.h> 5#include <stdio.h>
6 6
7#include "eo_suite.h"
8#include "Eo.h" 7#include "Eo.h"
8#include "eo_suite.h"
9 9
10START_TEST(eo_simple) 10START_TEST(eo_simple)
11{ 11{
diff --git a/legacy/eobj/src/tests/function_overrides/Makefile.am b/legacy/eobj/src/tests/function_overrides/Makefile.am
new file mode 100644
index 0000000000..90c9582b04
--- /dev/null
+++ b/legacy/eobj/src/tests/function_overrides/Makefile.am
@@ -0,0 +1,23 @@
1
2MAINTAINERCLEANFILES = Makefile.in
3
4AM_CPPFLAGS = \
5-I$(top_srcdir)/src/lib \
6-I$(top_builddir)/src/lib \
7@EFL_EO_BUILD@ \
8@EO_CFLAGS@
9
10noinst_PROGRAMS = function_overrides
11
12function_overrides_SOURCES = \
13inherit.c \
14inherit.h \
15inherit2.c \
16inherit2.h \
17inherit3.c \
18inherit3.h \
19main.c \
20simple.c \
21simple.h
22
23function_overrides_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@
diff --git a/legacy/eobj/src/tests/function_overrides/inherit.c b/legacy/eobj/src/tests/function_overrides/inherit.c
index a3cd3c9c95..2b3ad489c3 100644
--- a/legacy/eobj/src/tests/function_overrides/inherit.c
+++ b/legacy/eobj/src/tests/function_overrides/inherit.c
@@ -1,6 +1,9 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "simple.h" 6#include "simple.h"
3
4#include "inherit.h" 7#include "inherit.h"
5 8
6#define MY_CLASS INHERIT_CLASS 9#define MY_CLASS INHERIT_CLASS
diff --git a/legacy/eobj/src/tests/function_overrides/inherit.h b/legacy/eobj/src/tests/function_overrides/inherit.h
index d72c73a283..2f33647958 100644
--- a/legacy/eobj/src/tests/function_overrides/inherit.h
+++ b/legacy/eobj/src/tests/function_overrides/inherit.h
@@ -1,8 +1,6 @@
1#ifndef INHERIT_H 1#ifndef INHERIT_H
2#define INHERIT_H 2#define INHERIT_H
3 3
4#include "Eo.h"
5
6#define INHERIT_CLASS inherit_class_get() 4#define INHERIT_CLASS inherit_class_get()
7const Eo_Class *inherit_class_get(void); 5const Eo_Class *inherit_class_get(void);
8 6
diff --git a/legacy/eobj/src/tests/function_overrides/inherit2.c b/legacy/eobj/src/tests/function_overrides/inherit2.c
index 6814a34a4d..484b6d0444 100644
--- a/legacy/eobj/src/tests/function_overrides/inherit2.c
+++ b/legacy/eobj/src/tests/function_overrides/inherit2.c
@@ -1,11 +1,12 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "simple.h" 6#include "simple.h"
3
4#include "inherit.h" 7#include "inherit.h"
5#include "inherit2.h" 8#include "inherit2.h"
6 9
7#include "config.h"
8
9#include "../eunit_tests.h" 10#include "../eunit_tests.h"
10 11
11EAPI Eo_Op INHERIT2_BASE_ID = 0; 12EAPI Eo_Op INHERIT2_BASE_ID = 0;
diff --git a/legacy/eobj/src/tests/function_overrides/inherit2.h b/legacy/eobj/src/tests/function_overrides/inherit2.h
index 2bf7db997d..2bc0b0d36a 100644
--- a/legacy/eobj/src/tests/function_overrides/inherit2.h
+++ b/legacy/eobj/src/tests/function_overrides/inherit2.h
@@ -1,8 +1,6 @@
1#ifndef INHERIT2_H 1#ifndef INHERIT2_H
2#define INHERIT2_H 2#define INHERIT2_H
3 3
4#include "Eo.h"
5
6extern EAPI Eo_Op INHERIT2_BASE_ID; 4extern EAPI Eo_Op INHERIT2_BASE_ID;
7 5
8enum { 6enum {
diff --git a/legacy/eobj/src/tests/function_overrides/inherit3.c b/legacy/eobj/src/tests/function_overrides/inherit3.c
index e36ab77233..66f31fe5e5 100644
--- a/legacy/eobj/src/tests/function_overrides/inherit3.c
+++ b/legacy/eobj/src/tests/function_overrides/inherit3.c
@@ -1,11 +1,12 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "simple.h" 6#include "simple.h"
3
4#include "inherit2.h" 7#include "inherit2.h"
5#include "inherit3.h" 8#include "inherit3.h"
6 9
7#include "config.h"
8
9#define MY_CLASS INHERIT3_CLASS 10#define MY_CLASS INHERIT3_CLASS
10 11
11static void 12static void
diff --git a/legacy/eobj/src/tests/function_overrides/inherit3.h b/legacy/eobj/src/tests/function_overrides/inherit3.h
index 47d5d1cf82..73436ba239 100644
--- a/legacy/eobj/src/tests/function_overrides/inherit3.h
+++ b/legacy/eobj/src/tests/function_overrides/inherit3.h
@@ -1,8 +1,6 @@
1#ifndef INHERIT3_H 1#ifndef INHERIT3_H
2#define INHERIT3_H 2#define INHERIT3_H
3 3
4#include "Eo.h"
5
6#define INHERIT3_CLASS inherit3_class_get() 4#define INHERIT3_CLASS inherit3_class_get()
7const Eo_Class *inherit3_class_get(void); 5const Eo_Class *inherit3_class_get(void);
8 6
diff --git a/legacy/eobj/src/tests/function_overrides/main.c b/legacy/eobj/src/tests/function_overrides/main.c
index af39c67265..c45cfe5908 100644
--- a/legacy/eobj/src/tests/function_overrides/main.c
+++ b/legacy/eobj/src/tests/function_overrides/main.c
@@ -1,3 +1,7 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "simple.h" 6#include "simple.h"
3#include "inherit.h" 7#include "inherit.h"
diff --git a/legacy/eobj/src/tests/function_overrides/simple.c b/legacy/eobj/src/tests/function_overrides/simple.c
index bc3692cf22..378189072f 100644
--- a/legacy/eobj/src/tests/function_overrides/simple.c
+++ b/legacy/eobj/src/tests/function_overrides/simple.c
@@ -1,7 +1,10 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "simple.h" 6#include "simple.h"
3 7
4#include "config.h"
5#include "../eunit_tests.h" 8#include "../eunit_tests.h"
6 9
7EAPI Eo_Op SIMPLE_BASE_ID = 0; 10EAPI Eo_Op SIMPLE_BASE_ID = 0;
diff --git a/legacy/eobj/src/tests/function_overrides/simple.h b/legacy/eobj/src/tests/function_overrides/simple.h
index a447d8cc5c..3a620fa611 100644
--- a/legacy/eobj/src/tests/function_overrides/simple.h
+++ b/legacy/eobj/src/tests/function_overrides/simple.h
@@ -1,8 +1,6 @@
1#ifndef SIMPLE_H 1#ifndef SIMPLE_H
2#define SIMPLE_H 2#define SIMPLE_H
3 3
4#include "Eo.h"
5
6extern EAPI Eo_Op SIMPLE_BASE_ID; 4extern EAPI Eo_Op SIMPLE_BASE_ID;
7 5
8enum { 6enum {
diff --git a/legacy/eobj/src/tests/interface/Makefile.am b/legacy/eobj/src/tests/interface/Makefile.am
new file mode 100644
index 0000000000..fa927fb1bf
--- /dev/null
+++ b/legacy/eobj/src/tests/interface/Makefile.am
@@ -0,0 +1,21 @@
1
2MAINTAINERCLEANFILES = Makefile.in
3
4AM_CPPFLAGS = \
5-I$(top_srcdir)/src/lib \
6-I$(top_builddir)/src/lib \
7@EFL_EO_BUILD@ \
8@EO_CFLAGS@
9
10noinst_PROGRAMS = interface
11
12interface_SOURCES = \
13interface.c \
14interface.h \
15interface2.c \
16interface2.h \
17main.c \
18simple.c \
19simple.h
20
21interface_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@
diff --git a/legacy/eobj/src/tests/interface/interface.c b/legacy/eobj/src/tests/interface/interface.c
index 16659d507c..27a986bc17 100644
--- a/legacy/eobj/src/tests/interface/interface.c
+++ b/legacy/eobj/src/tests/interface/interface.c
@@ -1,9 +1,11 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "interface.h" 6#include "interface.h"
3#include "simple.h" 7#include "simple.h"
4 8
5#include "config.h"
6
7EAPI Eo_Op INTERFACE_BASE_ID = 0; 9EAPI Eo_Op INTERFACE_BASE_ID = 0;
8 10
9#define MY_CLASS INTERFACE_CLASS 11#define MY_CLASS INTERFACE_CLASS
diff --git a/legacy/eobj/src/tests/interface/interface.h b/legacy/eobj/src/tests/interface/interface.h
index 9a1c5fd07d..4e161b8488 100644
--- a/legacy/eobj/src/tests/interface/interface.h
+++ b/legacy/eobj/src/tests/interface/interface.h
@@ -1,8 +1,6 @@
1#ifndef INTERFACE_H 1#ifndef INTERFACE_H
2#define INTERFACE_H 2#define INTERFACE_H
3 3
4#include "Eo.h"
5
6extern EAPI Eo_Op INTERFACE_BASE_ID; 4extern EAPI Eo_Op INTERFACE_BASE_ID;
7 5
8enum { 6enum {
diff --git a/legacy/eobj/src/tests/interface/interface2.c b/legacy/eobj/src/tests/interface/interface2.c
index 2ccd83215d..74619dbdbd 100644
--- a/legacy/eobj/src/tests/interface/interface2.c
+++ b/legacy/eobj/src/tests/interface/interface2.c
@@ -1,10 +1,12 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "interface.h" 6#include "interface.h"
3#include "interface2.h" 7#include "interface2.h"
4#include "simple.h" 8#include "simple.h"
5 9
6#include "config.h"
7
8EAPI Eo_Op INTERFACE2_BASE_ID = 0; 10EAPI Eo_Op INTERFACE2_BASE_ID = 0;
9 11
10#define MY_CLASS INTERFACE2_CLASS 12#define MY_CLASS INTERFACE2_CLASS
diff --git a/legacy/eobj/src/tests/interface/interface2.h b/legacy/eobj/src/tests/interface/interface2.h
index 205b9b3ccd..5aa91f4fdc 100644
--- a/legacy/eobj/src/tests/interface/interface2.h
+++ b/legacy/eobj/src/tests/interface/interface2.h
@@ -1,8 +1,6 @@
1#ifndef INTERFACE2_H 1#ifndef INTERFACE2_H
2#define INTERFACE2_H 2#define INTERFACE2_H
3 3
4#include "Eo.h"
5
6extern EAPI Eo_Op INTERFACE2_BASE_ID; 4extern EAPI Eo_Op INTERFACE2_BASE_ID;
7 5
8enum { 6enum {
diff --git a/legacy/eobj/src/tests/interface/main.c b/legacy/eobj/src/tests/interface/main.c
index e83ced9248..0abe495456 100644
--- a/legacy/eobj/src/tests/interface/main.c
+++ b/legacy/eobj/src/tests/interface/main.c
@@ -1,3 +1,7 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "simple.h" 6#include "simple.h"
3#include "interface.h" 7#include "interface.h"
diff --git a/legacy/eobj/src/tests/interface/simple.c b/legacy/eobj/src/tests/interface/simple.c
index c76315afaf..d19ecad82f 100644
--- a/legacy/eobj/src/tests/interface/simple.c
+++ b/legacy/eobj/src/tests/interface/simple.c
@@ -1,10 +1,12 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "interface.h" 6#include "interface.h"
3#include "interface2.h" 7#include "interface2.h"
4#include "simple.h" 8#include "simple.h"
5 9
6#include "config.h"
7
8EAPI Eo_Op SIMPLE_BASE_ID = 0; 10EAPI Eo_Op SIMPLE_BASE_ID = 0;
9 11
10typedef struct 12typedef struct
diff --git a/legacy/eobj/src/tests/interface/simple.h b/legacy/eobj/src/tests/interface/simple.h
index 61fa2f086a..8df8131278 100644
--- a/legacy/eobj/src/tests/interface/simple.h
+++ b/legacy/eobj/src/tests/interface/simple.h
@@ -1,8 +1,6 @@
1#ifndef SIMPLE_H 1#ifndef SIMPLE_H
2#define SIMPLE_H 2#define SIMPLE_H
3 3
4#include "Eo.h"
5
6extern EAPI Eo_Op SIMPLE_BASE_ID; 4extern EAPI Eo_Op SIMPLE_BASE_ID;
7 5
8enum { 6enum {
diff --git a/legacy/eobj/src/tests/mixin/Makefile.am b/legacy/eobj/src/tests/mixin/Makefile.am
new file mode 100644
index 0000000000..fd034916d0
--- /dev/null
+++ b/legacy/eobj/src/tests/mixin/Makefile.am
@@ -0,0 +1,27 @@
1
2MAINTAINERCLEANFILES = Makefile.in
3
4AM_CPPFLAGS = \
5-I$(top_srcdir)/src/lib \
6-I$(top_builddir)/src/lib \
7@EFL_EO_BUILD@ \
8@EO_CFLAGS@
9
10noinst_PROGRAMS = mixin
11
12mixin_SOURCES = \
13inherit.c \
14inherit.h \
15main.c \
16mixin.c \
17mixin.h \
18mixin2.c \
19mixin2.h \
20mixin3.c \
21mixin3.h \
22mixin4.c \
23mixin4.h \
24simple.c \
25simple.h
26
27mixin_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@
diff --git a/legacy/eobj/src/tests/mixin/inherit.c b/legacy/eobj/src/tests/mixin/inherit.c
index 53c8826953..f23ec41e22 100644
--- a/legacy/eobj/src/tests/mixin/inherit.c
+++ b/legacy/eobj/src/tests/mixin/inherit.c
@@ -1,8 +1,12 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
6#include "simple.h"
7#include "mixin4.h"
2#include "inherit.h" 8#include "inherit.h"
3 9
4#include "config.h"
5
6#define MY_CLASS INHERIT_CLASS 10#define MY_CLASS INHERIT_CLASS
7 11
8static void 12static void
diff --git a/legacy/eobj/src/tests/mixin/inherit.h b/legacy/eobj/src/tests/mixin/inherit.h
index b6d78fbf0b..2f33647958 100644
--- a/legacy/eobj/src/tests/mixin/inherit.h
+++ b/legacy/eobj/src/tests/mixin/inherit.h
@@ -1,10 +1,6 @@
1#ifndef INHERIT_H 1#ifndef INHERIT_H
2#define INHERIT_H 2#define INHERIT_H
3 3
4#include "Eo.h"
5#include "simple.h"
6#include "mixin4.h"
7
8#define INHERIT_CLASS inherit_class_get() 4#define INHERIT_CLASS inherit_class_get()
9const Eo_Class *inherit_class_get(void); 5const Eo_Class *inherit_class_get(void);
10 6
diff --git a/legacy/eobj/src/tests/mixin/main.c b/legacy/eobj/src/tests/mixin/main.c
index c69754da78..bd0c289617 100644
--- a/legacy/eobj/src/tests/mixin/main.c
+++ b/legacy/eobj/src/tests/mixin/main.c
@@ -1,3 +1,7 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "simple.h" 6#include "simple.h"
3#include "inherit.h" 7#include "inherit.h"
diff --git a/legacy/eobj/src/tests/mixin/mixin.c b/legacy/eobj/src/tests/mixin/mixin.c
index e9381e91d3..3be53ce397 100644
--- a/legacy/eobj/src/tests/mixin/mixin.c
+++ b/legacy/eobj/src/tests/mixin/mixin.c
@@ -1,9 +1,11 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "mixin.h" 6#include "mixin.h"
3#include "simple.h" 7#include "simple.h"
4 8
5#include "config.h"
6
7EAPI Eo_Op MIXIN_BASE_ID = 0; 9EAPI Eo_Op MIXIN_BASE_ID = 0;
8 10
9#define MY_CLASS MIXIN_CLASS 11#define MY_CLASS MIXIN_CLASS
diff --git a/legacy/eobj/src/tests/mixin/mixin.h b/legacy/eobj/src/tests/mixin/mixin.h
index 2fa0c2248a..745e5c4683 100644
--- a/legacy/eobj/src/tests/mixin/mixin.h
+++ b/legacy/eobj/src/tests/mixin/mixin.h
@@ -1,8 +1,6 @@
1#ifndef MIXIN_H 1#ifndef MIXIN_H
2#define MIXIN_H 2#define MIXIN_H
3 3
4#include "Eo.h"
5
6extern EAPI Eo_Op MIXIN_BASE_ID; 4extern EAPI Eo_Op MIXIN_BASE_ID;
7 5
8enum { 6enum {
diff --git a/legacy/eobj/src/tests/mixin/mixin2.c b/legacy/eobj/src/tests/mixin/mixin2.c
index c17dea60c0..a6eb82db53 100644
--- a/legacy/eobj/src/tests/mixin/mixin2.c
+++ b/legacy/eobj/src/tests/mixin/mixin2.c
@@ -1,10 +1,12 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "mixin.h" 6#include "mixin.h"
3#include "mixin2.h" 7#include "mixin2.h"
4#include "simple.h" 8#include "simple.h"
5 9
6#include "config.h"
7
8#include "../eunit_tests.h" 10#include "../eunit_tests.h"
9 11
10#define MY_CLASS MIXIN2_CLASS 12#define MY_CLASS MIXIN2_CLASS
diff --git a/legacy/eobj/src/tests/mixin/mixin2.h b/legacy/eobj/src/tests/mixin/mixin2.h
index 324afaf0ce..6e4b692d41 100644
--- a/legacy/eobj/src/tests/mixin/mixin2.h
+++ b/legacy/eobj/src/tests/mixin/mixin2.h
@@ -1,8 +1,6 @@
1#ifndef MIXIN2_H 1#ifndef MIXIN2_H
2#define MIXIN2_H 2#define MIXIN2_H
3 3
4#include "Eo.h"
5
6typedef struct 4typedef struct
7{ 5{
8 int count; 6 int count;
diff --git a/legacy/eobj/src/tests/mixin/mixin3.c b/legacy/eobj/src/tests/mixin/mixin3.c
index 94253b613b..62468afef0 100644
--- a/legacy/eobj/src/tests/mixin/mixin3.c
+++ b/legacy/eobj/src/tests/mixin/mixin3.c
@@ -1,10 +1,12 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "mixin.h" 6#include "mixin.h"
3#include "mixin3.h" 7#include "mixin3.h"
4#include "simple.h" 8#include "simple.h"
5 9
6#include "config.h"
7
8#include "../eunit_tests.h" 10#include "../eunit_tests.h"
9 11
10#define MY_CLASS MIXIN3_CLASS 12#define MY_CLASS MIXIN3_CLASS
diff --git a/legacy/eobj/src/tests/mixin/mixin3.h b/legacy/eobj/src/tests/mixin/mixin3.h
index a05c2ec541..36b32c0aa8 100644
--- a/legacy/eobj/src/tests/mixin/mixin3.h
+++ b/legacy/eobj/src/tests/mixin/mixin3.h
@@ -1,8 +1,6 @@
1#ifndef MIXIN3_H 1#ifndef MIXIN3_H
2#define MIXIN3_H 2#define MIXIN3_H
3 3
4#include "Eo.h"
5
6typedef struct 4typedef struct
7{ 5{
8 int count; 6 int count;
diff --git a/legacy/eobj/src/tests/mixin/mixin4.c b/legacy/eobj/src/tests/mixin/mixin4.c
index 17944bc901..185884156b 100644
--- a/legacy/eobj/src/tests/mixin/mixin4.c
+++ b/legacy/eobj/src/tests/mixin/mixin4.c
@@ -1,10 +1,12 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "mixin.h" 6#include "mixin.h"
3#include "mixin4.h" 7#include "mixin4.h"
4#include "simple.h" 8#include "simple.h"
5 9
6#include "config.h"
7
8#include "../eunit_tests.h" 10#include "../eunit_tests.h"
9 11
10#define MY_CLASS MIXIN4_CLASS 12#define MY_CLASS MIXIN4_CLASS
diff --git a/legacy/eobj/src/tests/mixin/mixin4.h b/legacy/eobj/src/tests/mixin/mixin4.h
index e924332fdc..7b520fad19 100644
--- a/legacy/eobj/src/tests/mixin/mixin4.h
+++ b/legacy/eobj/src/tests/mixin/mixin4.h
@@ -1,8 +1,6 @@
1#ifndef MIXIN4_H 1#ifndef MIXIN4_H
2#define MIXIN4_H 2#define MIXIN4_H
3 3
4#include "Eo.h"
5
6#define MIXIN4_CLASS mixin4_class_get() 4#define MIXIN4_CLASS mixin4_class_get()
7const Eo_Class *mixin4_class_get(void); 5const Eo_Class *mixin4_class_get(void);
8 6
diff --git a/legacy/eobj/src/tests/mixin/simple.c b/legacy/eobj/src/tests/mixin/simple.c
index ae93708a6b..d7b95f2e85 100644
--- a/legacy/eobj/src/tests/mixin/simple.c
+++ b/legacy/eobj/src/tests/mixin/simple.c
@@ -1,11 +1,13 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "mixin.h" 6#include "mixin.h"
3#include "mixin2.h" 7#include "mixin2.h"
4#include "mixin3.h" 8#include "mixin3.h"
5#include "simple.h" 9#include "simple.h"
6 10
7#include "config.h"
8
9EAPI Eo_Op SIMPLE_BASE_ID = 0; 11EAPI Eo_Op SIMPLE_BASE_ID = 0;
10 12
11typedef struct 13typedef struct
diff --git a/legacy/eobj/src/tests/mixin/simple.h b/legacy/eobj/src/tests/mixin/simple.h
index 61fa2f086a..8df8131278 100644
--- a/legacy/eobj/src/tests/mixin/simple.h
+++ b/legacy/eobj/src/tests/mixin/simple.h
@@ -1,8 +1,6 @@
1#ifndef SIMPLE_H 1#ifndef SIMPLE_H
2#define SIMPLE_H 2#define SIMPLE_H
3 3
4#include "Eo.h"
5
6extern EAPI Eo_Op SIMPLE_BASE_ID; 4extern EAPI Eo_Op SIMPLE_BASE_ID;
7 5
8enum { 6enum {
diff --git a/legacy/eobj/src/tests/signals/Makefile.am b/legacy/eobj/src/tests/signals/Makefile.am
new file mode 100644
index 0000000000..895e114b83
--- /dev/null
+++ b/legacy/eobj/src/tests/signals/Makefile.am
@@ -0,0 +1,17 @@
1
2MAINTAINERCLEANFILES = Makefile.in
3
4AM_CPPFLAGS = \
5-I$(top_srcdir)/src/lib \
6-I$(top_builddir)/src/lib \
7@EFL_EO_BUILD@ \
8@EO_CFLAGS@
9
10noinst_PROGRAMS = signals
11
12signals_SOURCES = \
13main.c \
14simple.c \
15simple.h
16
17signals_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@
diff --git a/legacy/eobj/src/tests/signals/main.c b/legacy/eobj/src/tests/signals/main.c
index 26ac85371d..69e25b06a1 100644
--- a/legacy/eobj/src/tests/signals/main.c
+++ b/legacy/eobj/src/tests/signals/main.c
@@ -1,3 +1,7 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "simple.h" 6#include "simple.h"
3 7
diff --git a/legacy/eobj/src/tests/signals/simple.c b/legacy/eobj/src/tests/signals/simple.c
index 08210ead3d..168761c0b9 100644
--- a/legacy/eobj/src/tests/signals/simple.c
+++ b/legacy/eobj/src/tests/signals/simple.c
@@ -1,8 +1,10 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include "Eo.h" 5#include "Eo.h"
2#include "simple.h" 6#include "simple.h"
3 7
4#include "config.h"
5
6EAPI Eo_Op SIMPLE_BASE_ID = 0; 8EAPI Eo_Op SIMPLE_BASE_ID = 0;
7 9
8typedef struct 10typedef struct
diff --git a/legacy/eobj/src/tests/signals/simple.h b/legacy/eobj/src/tests/signals/simple.h
index e54cf2aa8f..d1f63bdd06 100644
--- a/legacy/eobj/src/tests/signals/simple.h
+++ b/legacy/eobj/src/tests/signals/simple.h
@@ -1,8 +1,6 @@
1#ifndef SIMPLE_H 1#ifndef SIMPLE_H
2#define SIMPLE_H 2#define SIMPLE_H
3 3
4#include "Eo.h"
5
6extern EAPI Eo_Op SIMPLE_BASE_ID; 4extern EAPI Eo_Op SIMPLE_BASE_ID;
7 5
8enum { 6enum {