From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Tue, 14 Mar 2017 10:49:13 +0000 (+0100)
Subject: tests: Merge two main methods
X-Git-Tag: 0.36.0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95b8e0763f8ab8903f1c124873136ac14d1940cf;p=thirdparty%2Fvala.git

tests: Merge two main methods
---

diff --git a/tests/objects/signals.vala b/tests/objects/signals.vala
index 3a07d99f4..195f563c8 100644
--- a/tests/objects/signals.vala
+++ b/tests/objects/signals.vala
@@ -46,31 +46,6 @@ class Maman.Bar : Object {
 
 		stdout.printf (" 9");
 	}
-
-	public static int main () {
-		stdout.printf ("Signal Test: 1");
-		
-		var bar = new Bar ();
-		bar.run ();
-	
-		stdout.printf (" 10\n");
-
-		stdout.printf ("User Signal Test: 1");
-
-		var user_bar = new UserBar ();
-		user_bar.run ();
-
-		stdout.printf (" 6\n");
-
-		stdout.printf ("Signal Return Test: 1");
-
-		var return_bar = new ReturnBar ();
-		return_bar.run ();
-
-		stdout.printf (" 8\n");
-
-		return 0;
-	}
 }
 
 class Maman.UserFoo : Object {
@@ -129,6 +104,25 @@ class Maman.ReturnBar : Object {
 }
 
 void main () {
-	Maman.Bar.main ();
+	stdout.printf ("Signal Test: 1");
+
+	var bar = new Maman.Bar ();
+	bar.run ();
+
+	stdout.printf (" 10\n");
+
+	stdout.printf ("User Signal Test: 1");
+
+	var user_bar = new Maman.UserBar ();
+	user_bar.run ();
+
+	stdout.printf (" 6\n");
+
+	stdout.printf ("Signal Return Test: 1");
+
+	var return_bar = new Maman.ReturnBar ();
+	return_bar.run ();
+
+	stdout.printf (" 8\n");
 }