2009-03-26 Zoltan Varga <vargaz@gmail.com>

	* pinvoke2.cs: Add a test for #488670.

svn path=/trunk/mono/; revision=130257

diff --git a/mono/tests/ChangeLog b/mono/tests/ChangeLog
index e9d6ac0269148b54b7081e64204f7418e0822401..fbb11d650ba4a4a38a2f2991dc5fb1b4fac2b099 100644 (file)
--- a/mono/tests/ChangeLog
+++ b/mono/tests/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-26  Zoltan Varga  <vargaz@gmail.com>
+
+       * pinvoke2.cs: Add a test for #488670.
+
 2009-03-25  Mark Probst  <mark.probst@gmail.com>
 
        * interlocked-4.2.cs: New CompareExchange test (triggered register

diff --git a/mono/tests/pinvoke2.cs b/mono/tests/pinvoke2.cs
index d49c63ea4378eec3c5827e70212afc5170a2dd24..33363fa0ceb88a869217397d7b3e8e0094bfaaa1 100644 (file)
--- a/mono/tests/pinvoke2.cs
+++ b/mono/tests/pinvoke2.cs
@@ -1484,5 +1484,21 @@ public class Tests {
                
                return 1;
        }
+
+       /*
+        * Marshalling of type 'object'
+        */
+
+       [DllImport ("libtest", EntryPoint="mono_test_marshal_class")]
+       public static extern SimpleClass mono_test_marshal_object (int i, int j, int k, object ss, int l);
+
+       public static int test_0_marshal_object () {
+               try {
+                       mono_test_marshal_object (0, 0, 0, null, 0);
+                       return 1;
+               } catch (Exception) {
+                       return 0;
+               }
+       }
 }