tests: Drop usage of "--main main" and avoid ambigious entry-points

diff --git a/tests/basic-types/pointers.vala b/tests/basic-types/pointers.vala
index 7517e71b058980a219c68105308c47c50ca375c8..cad12a7005dc2222f4fe684fb2af7c829d577113 100644 (file)
--- a/tests/basic-types/pointers.vala
+++ b/tests/basic-types/pointers.vala
@@ -35,8 +35,3 @@ struct SimpleStruct {
                assert (i == 42);
        }
 }
-
-void main () {
-       SimpleStruct.main ();
-}
-

diff --git a/tests/control-flow/break.vala b/tests/control-flow/break.vala
index 8505959ad74dd1da6ffa78508e09732e6659ac41..51719f1a32c4be86360d3d6a2583211c2d31c50c 100644 (file)
--- a/tests/control-flow/break.vala
+++ b/tests/control-flow/break.vala
@@ -15,7 +15,3 @@ class Maman.Bar : Object {
                return 0;
        }
 }
-
-void main () {
-       Maman.Bar.main ();
-}

diff --git a/tests/control-flow/expressions-conditional.vala b/tests/control-flow/expressions-conditional.vala
index 5c48350b5fa0658a70219526fcba6d6fc5f3fb13..d75428cec21e1bb1b2cb7a9616d8d4e034995e73 100644 (file)
--- a/tests/control-flow/expressions-conditional.vala
+++ b/tests/control-flow/expressions-conditional.vala
@@ -19,7 +19,3 @@ class Maman.Bar : Object {
                return 0;
        }
 }
-
-void main () {
-       Maman.Bar.main ();
-}

diff --git a/tests/control-flow/switch.vala b/tests/control-flow/switch.vala
index 5a1bb24af14364dd4f9ef402fc47d350117f7f15..8f52aebf328afc97a0820f5e17b24d93abfa8979 100644 (file)
--- a/tests/control-flow/switch.vala
+++ b/tests/control-flow/switch.vala
@@ -80,9 +80,3 @@ class Maman.Foo : Object {
 
        private int counter = 0;
 }
-
-
-void main () {
-       Maman.Bar.main ();
-}
-

diff --git a/tests/delegates/delegates.vala b/tests/delegates/delegates.vala
index 03fb9b17ff55af9687f7bcc27090461fa48b0e28..eb68ebd06e6efefa805dfefe9835fabb6ebcfc14 100644 (file)
--- a/tests/delegates/delegates.vala
+++ b/tests/delegates/delegates.vala
@@ -112,8 +112,3 @@ class Maman.Bar : Object, Foo {
                return 0;
        }
 }
-
-void main () {
-       Maman.Bar.main ();
-}
-

diff --git a/tests/enums/enums.vala b/tests/enums/enums.vala
index 87bb127d03178600e6b1e80e615c8cfecb506fd1..9e7dc39b31bdefcd14c4b8ad14ebeab9d8403453 100644 (file)
--- a/tests/enums/enums.vala
+++ b/tests/enums/enums.vala
@@ -52,8 +52,3 @@ class Maman.Bar : Object {
                return 0;
        }
 }
-
-void main () {
-       Maman.Bar.main ();
-}
-

diff --git a/tests/methods/lambda.vala b/tests/methods/lambda.vala
index 00afd9faa583298236edcc02d7761b168a44b9a3..e15686692a07f339d46102d2b037e6f7967efa4b 100644 (file)
--- a/tests/methods/lambda.vala
+++ b/tests/methods/lambda.vala
@@ -30,8 +30,3 @@ class Maman.Bar : Object {
                return 0;
        }
 }
-
-void main () {
-       Maman.Bar.main ();
-}
-

diff --git a/tests/objects/fields.vala b/tests/objects/fields.vala
index 4f398eb700029dc7ce8ec46a43716e1f1578b653..acc7e40e1ceebb9409dd9d12dd1fdcfd1c1c06b2 100644 (file)
--- a/tests/objects/fields.vala
+++ b/tests/objects/fields.vala
@@ -70,7 +70,7 @@ class Maman.Bar : Foo {
                                           private_class_field, public_class_field);
        }
 
-       public static int main () {
+       public static void run () {
                stdout.printf ("Field Test: 1");
 
                var bar = new Bar ();
@@ -95,8 +95,6 @@ class Maman.Bar : Foo {
                stdout.printf (" %d", compact.initialized_field);
 
                stdout.printf (" 27\n");
-
-               return 0;
        }
 }
 
@@ -105,7 +103,7 @@ class Maman.Baz<T> {
 }
 
 void main () {
-       Maman.Bar.main ();
+       Maman.Bar.run ();
        Maman.Baz<Maman.Bar> baz = new Maman.Baz<Maman.Bar> ();
        baz.foo = null;
 }

diff --git a/tests/objects/methods.vala b/tests/objects/methods.vala
index 9a950c322cce070a91708f4ba48a46ba864e2e41..cfacc9c735783258870e0be9fcde5d373df7fc12 100644 (file)
--- a/tests/objects/methods.vala
+++ b/tests/objects/methods.vala
@@ -221,8 +221,3 @@ class Maman.ClassTest {
                c.instance_method ();
        }
 }
-
-void main () {
-       Maman.SubBar.main ();
-}
-

diff --git a/tests/objects/properties.vala b/tests/objects/properties.vala
index b3fc2c8601be74798526c95b52280d5a4e54e25c..1ad97367eebd3ce72793a5916ea92c0ca8050e05 100644 (file)
--- a/tests/objects/properties.vala
+++ b/tests/objects/properties.vala
@@ -163,8 +163,3 @@ abstract class Maman.ABiz : Object, IBiz {
 class Maman.Biz : ABiz {
        public override int number2 { get; construct; }
 }
-
-void main () {
-       Sample.main ();
-}
-

diff --git a/tests/objects/test-025.vala b/tests/objects/test-025.vala
index af052e2775e633618d26a3fdb79cbb12d04116c9..607230e548f7fdde6e19ca7f8e964f9315e3c2d7 100644 (file)
--- a/tests/objects/test-025.vala
+++ b/tests/objects/test-025.vala
@@ -30,8 +30,3 @@ class Maman.SubBar : Bar {
                return 0;
        }
 }
-
-void main () {
-       Maman.SubBar.main ();
-}
-

diff --git a/tests/objects/test-026.vala b/tests/objects/test-026.vala
index 7d41972121527a0ed146b0b66c091b92a3e96456..5bc3b1716f59c36d5e8acd58fa5bed91228f7b43 100644 (file)
--- a/tests/objects/test-026.vala
+++ b/tests/objects/test-026.vala
@@ -30,8 +30,3 @@ class Maman.SubBar : Bar {
                return 0;
        }
 }
-
-void main () {
-       Maman.SubBar.main ();
-}
-

diff --git a/tests/objects/test-029.vala b/tests/objects/test-029.vala
index e923eafd4a98a55a7835c34321bca0d8335748eb..dbfd6717c0de1c7927e67b79490a08ca42346be3 100644 (file)
--- a/tests/objects/test-029.vala
+++ b/tests/objects/test-029.vala
@@ -23,8 +23,3 @@ class Maman.Foo : Object {
                return 0;
        }
 }
-
-void main () {
-       Maman.Foo.main ();
-}
-

diff --git a/tests/objects/test-034.vala b/tests/objects/test-034.vala
index 9d39b1f3b6e54a29dc059b82096dd39b59cbc60c..935a3cb92e43ebf8fb3d51178d292c787e8606e1 100644 (file)
--- a/tests/objects/test-034.vala
+++ b/tests/objects/test-034.vala
@@ -26,8 +26,3 @@ class Maman.Bar : Object {
                stdout.printf ("as C: %d %d %d\n", null != (a as C) ? 1 : 0, null != (b as C) ? 1 : 0, null != (c as C) ? 1 : 0);
        }
 }
-
-void main () {
-       Maman.Bar.main ();
-}
-

diff --git a/tests/testrunner.sh b/tests/testrunner.sh
index bfe3d6df6b27c277e4b29ddb57aea445c3e58451..92b4464277a44f5e77f2b5e48c1563ca010a7b94 100755 (executable)
--- a/tests/testrunner.sh
+++ b/tests/testrunner.sh
@@ -31,7 +31,6 @@ VALAC=$topbuilddir/compiler/valac$EXEEXT
 VALAFLAGS="$VALAFLAGS \
        --vapidir $vapidir \
        --disable-warnings \
-       --main main \
        --save-temps \
        --cc $CC \
        -X -g \