From ab39c0d3995e13b2ed9de334d12476be80380474 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Wed, 20 Jun 2012 15:56:17 +0000
Subject: [PATCH] Eo: Fix return value of eo_do_super to depend on error_set.

And added tests to check it.

SVN revision: 72550
---
 legacy/eobj/src/lib/eo.c                      |  3 ++
 .../src/tests/constructors/CMakeLists.txt     |  1 +
 legacy/eobj/src/tests/constructors/main.c     |  6 +++
 legacy/eobj/src/tests/constructors/simple6.c  |  2 +-
 legacy/eobj/src/tests/constructors/simple7.c  | 39 +++++++++++++++++++
 legacy/eobj/src/tests/constructors/simple7.h  |  9 +++++
 6 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 legacy/eobj/src/tests/constructors/simple7.c
 create mode 100644 legacy/eobj/src/tests/constructors/simple7.h

diff --git a/legacy/eobj/src/lib/eo.c b/legacy/eobj/src/lib/eo.c
index c8f9d3b8f6..b1f237c2dd 100644
--- a/legacy/eobj/src/lib/eo.c
+++ b/legacy/eobj/src/lib/eo.c
@@ -474,6 +474,9 @@ eo_do_super_internal(Eo *obj, Eo_Op_Type op_type, Eo_Op op, ...)
      }
    va_end(p_list);
 
+   if (obj->do_error)
+      ret = EINA_FALSE;
+
    return ret;
 }
 
diff --git a/legacy/eobj/src/tests/constructors/CMakeLists.txt b/legacy/eobj/src/tests/constructors/CMakeLists.txt
index 731d93d836..09dc10f500 100644
--- a/legacy/eobj/src/tests/constructors/CMakeLists.txt
+++ b/legacy/eobj/src/tests/constructors/CMakeLists.txt
@@ -6,6 +6,7 @@ LIST(APPEND CONSTRUCTORS_CC_SOURCES
    simple4.c
    simple5.c
    simple6.c
+   simple7.c
    mixin.c
    )
 
diff --git a/legacy/eobj/src/tests/constructors/main.c b/legacy/eobj/src/tests/constructors/main.c
index c2906d9df9..9bcf095d1e 100644
--- a/legacy/eobj/src/tests/constructors/main.c
+++ b/legacy/eobj/src/tests/constructors/main.c
@@ -5,6 +5,7 @@
 #include "simple4.h"
 #include "simple5.h"
 #include "simple6.h"
+#include "simple7.h"
 #include "mixin.h"
 
 #include "../eunit_tests.h"
@@ -48,11 +49,16 @@ main(int argc, char *argv[])
    fail_if(my_init_count != 0);
 
    obj = eo_add(SIMPLE5_CLASS, NULL);
+   fail_if(!obj);
    eo_unref(obj);
 
    obj = eo_add(SIMPLE6_CLASS, NULL);
+   fail_if(!obj);
    eo_unref(obj);
 
+   obj = eo_add(SIMPLE7_CLASS, NULL);
+   fail_if(obj);
+
    eo_shutdown();
    return ret;
 }
diff --git a/legacy/eobj/src/tests/constructors/simple6.c b/legacy/eobj/src/tests/constructors/simple6.c
index 743f3ef4a0..f6e5cbae66 100644
--- a/legacy/eobj/src/tests/constructors/simple6.c
+++ b/legacy/eobj/src/tests/constructors/simple6.c
@@ -9,7 +9,7 @@
 static void
 _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
 {
-   eo_do_super(obj, eo_constructor());
+   eo_do_super(obj, eo_destructor());
 
    eo_error_set(obj);
 }
diff --git a/legacy/eobj/src/tests/constructors/simple7.c b/legacy/eobj/src/tests/constructors/simple7.c
new file mode 100644
index 0000000000..a8f43d9eda
--- /dev/null
+++ b/legacy/eobj/src/tests/constructors/simple7.c
@@ -0,0 +1,39 @@
+#include "Eo.h"
+#include "mixin.h"
+#include "simple7.h"
+#include "simple2.h"
+
+#include "config.h"
+#include "../eunit_tests.h"
+
+#define MY_CLASS SIMPLE7_CLASS
+
+static void
+_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
+{
+   fail_if(eo_do_super(obj, eo_constructor()));
+}
+
+static void
+_class_constructor(Eo_Class *klass)
+{
+   const Eo_Op_Func_Description func_desc[] = {
+        EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
+        EO_OP_FUNC_SENTINEL
+   };
+
+   eo_class_funcs_set(klass, func_desc);
+}
+
+static const Eo_Class_Description class_desc = {
+     "Simple7",
+     EO_CLASS_TYPE_REGULAR,
+     EO_CLASS_DESCRIPTION_OPS(NULL, NULL, 0),
+     NULL,
+     0,
+     _class_constructor,
+     NULL
+};
+
+EO_DEFINE_CLASS(simple7_class_get, &class_desc, SIMPLE2_CLASS, NULL);
+
diff --git a/legacy/eobj/src/tests/constructors/simple7.h b/legacy/eobj/src/tests/constructors/simple7.h
new file mode 100644
index 0000000000..3710b62c14
--- /dev/null
+++ b/legacy/eobj/src/tests/constructors/simple7.h
@@ -0,0 +1,9 @@
+#ifndef SIMPLE7_H
+#define SIMPLE7_H
+
+#include "Eo.h"
+
+#define SIMPLE7_CLASS simple7_class_get()
+const Eo_Class *simple7_class_get(void);
+
+#endif