From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Wed, 7 Feb 2018 22:17:40 +0000 (+0100)
Subject: tests: Move namespaces.vala into parser and merge its main methods
X-Git-Tag: 0.39.91~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc629f3724d4a72e38726a4264ab69a925aa00c9;p=thirdparty%2Fvala.git

tests: Move namespaces.vala into parser and merge its main methods
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 063c7e8fd..c8f841657 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -65,7 +65,6 @@ TESTS = \
 	chainup/struct-this-foo.vala \
 	chainup/bug791785.vala \
 	pointers/bug590641.vala \
-	namespaces.vala \
 	methods/lambda.vala \
 	methods/closures.vala \
 	methods/contains.vala \
@@ -409,6 +408,7 @@ TESTS = \
 	parser/method-no-static-override.test \
 	parser/method-no-static-virtual.test \
 	parser/method-no-virtual-override.test \
+	parser/namespaces.vala \
 	parser/namespace-missing-bracket.test \
 	parser/preprocessor.vala \
 	parser/property-default-redefined.test \
diff --git a/tests/namespaces.vala b/tests/parser/namespaces.vala
similarity index 88%
rename from tests/namespaces.vala
rename to tests/parser/namespaces.vala
index b35db5927..aae68838f 100644
--- a/tests/namespaces.vala
+++ b/tests/parser/namespaces.vala
@@ -6,7 +6,7 @@ public class GlobalTestClass {
 }
 
 namespace Maman {
-	static int main () {
+	static void run () {
 		stdout.printf ("Namespace Test\n");
 
 		Bar.run ();
@@ -14,8 +14,6 @@ namespace Maman {
 		new GlobalTestClass();
 
 		var obj = new ClassInNestedNamespace ();
-
-		return 0;
 	}
 
 	class Bar : Object {
@@ -28,8 +26,7 @@ namespace Maman {
 public class Foo.Sub.ClassInNestedNamespace {
 }
 
-
 void main () {
-	Maman.main ();
+	Maman.run ();
 }