aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-02-15 19:02:05 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-02-15 19:02:05 +0100
commitb0d3e1be29213d464ad4dee36c07883daebdb11e (patch)
tree9170c9007b2948119ebfd3aef3201303e80c999a
parenteolian gen: initial support for reflection api (diff)
downloadefl-devs/bu5hm4n/csharp_explosions.tar.gz
I see fire, in a mountaindevs/bu5hm4n/csharp_explosions
-rw-r--r--src/bindings/mono/efl_mono/efl_csharp_application.cs8
-rw-r--r--src/tests/efl_mono/Main.cs15
2 files changed, 9 insertions, 14 deletions
diff --git a/src/bindings/mono/efl_mono/efl_csharp_application.cs b/src/bindings/mono/efl_mono/efl_csharp_application.cs
index 84732d3993..ed61ec07be 100644
--- a/src/bindings/mono/efl_mono/efl_csharp_application.cs
+++ b/src/bindings/mono/efl_mono/efl_csharp_application.cs
@@ -40,11 +40,7 @@ namespace Efl {
private static Components initComponent;
//what follows are 3 private functions to boot up the internals of efl
private static void Init(Efl.Csharp.Components component) {
- Eina.Config.Init();
- Efl.Eo.Config.Init();
ecore_init();
- evas_init();
- eldbus.Config.Init();
if (component == Components.Ui) {
// TODO Support elm command line arguments
@@ -67,11 +63,7 @@ namespace Efl {
if (initComponent == Components.Ui) {
elm_shutdown();
}
- eldbus.Config.Shutdown();
- evas_shutdown();
ecore_shutdown();
- Efl.Eo.Config.Shutdown();
- Eina.Config.Shutdown();
}
/// <summary>
/// Called when the application is started. Arguments from the command line are passed here.
diff --git a/src/tests/efl_mono/Main.cs b/src/tests/efl_mono/Main.cs
index 3ae3584798..422eb05290 100644
--- a/src/tests/efl_mono/Main.cs
+++ b/src/tests/efl_mono/Main.cs
@@ -4,8 +4,13 @@ using System.Runtime.CompilerServices;
using System.Reflection;
using System.Linq;
-class TestMain
+class TestMain : Efl.Csharp.Application
{
+ static void Main() {
+ TestMain test = new TestMain();
+ test.Launch();
+ }
+
static Type[] GetTestCases(String name="")
{
return Assembly.GetExecutingAssembly().GetTypes().Where(t => String.Equals(t.Namespace, "TestSuite", StringComparison.Ordinal) &&
@@ -13,7 +18,7 @@ class TestMain
t.Name.Contains(name)).ToArray();
}
- static int Main(string[] args)
+ protected override void OnInitialize(Eina.Array<System.String> args)
{
Efl.All.Init();
@@ -23,7 +28,7 @@ class TestMain
String ckRunCase = Environment.GetEnvironmentVariable("CK_RUN_CASE");
if (ckRunSuite != null && !ckRunSuite.Equals("mono"))
- return 0;
+ return;
if (ckRunCase == null)
ckRunCase = String.Empty;
@@ -93,8 +98,6 @@ class TestMain
Console.WriteLine("[ END SUITE ] " + ckRunSuite);
if (!pass)
- return -1;
-
- return 0;
+ System.Environment.Exit(-1);
}
}