2008-08-02 Zoltan Varga <vargaz@gmail.com>

	* pinvoke2.cs libtest.c: Extend the ia64 single HFA test so it also checks for
	#109511.

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

diff --git a/mono/tests/ChangeLog b/mono/tests/ChangeLog
index 7ea21c1757ec7db69fb28fff8a289085950f4aad..4af90b9f540eb533a8dbaa6cad712227c3c13b3a 100644 (file)
--- a/mono/tests/ChangeLog
+++ b/mono/tests/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-02  Zoltan Varga  <vargaz@gmail.com>
+
+       * pinvoke2.cs libtest.c: Extend the ia64 single HFA test so it also checks for
+       #109511.
+
 2008-07-28  Zoltan Varga  <vargaz@gmail.com>
 
        * Makefile.am: Use custom-modifiers.2.cs instead of custom-modifiers.cs

diff --git a/mono/tests/libtest.c b/mono/tests/libtest.c
index 87d64445974ac30c2e624f5fe75ba7d71c1e8c63..a052f05357bf6e2b7a0022613eac3dede7f80b78 100644 (file)
--- a/mono/tests/libtest.c
+++ b/mono/tests/libtest.c
@@ -1570,10 +1570,10 @@ typedef struct test_struct5 {
 } test_struct5;
 
 LIBTEST_API test_struct5 STDCALL 
-mono_test_marshal_ia64_pass_return_struct5 (double d1, double d2, test_struct5 s, double d3, double d4)
+mono_test_marshal_ia64_pass_return_struct5 (double d1, double d2, test_struct5 s, int i, double d3, double d4)
 {
-       s.d1 += d1 + d2;
-       s.d2 += d3 + d4;
+       s.d1 += d1 + d2 + i;
+       s.d2 += d3 + d4 + i;
 
        return s;
 }

diff --git a/mono/tests/pinvoke2.cs b/mono/tests/pinvoke2.cs
index 258a84f560440425aba2552c0ac5976d2c2d03d1..53ec6e28180da00ebbb6ec555a3ebbed62b8160c 100644 (file)
--- a/mono/tests/pinvoke2.cs
+++ b/mono/tests/pinvoke2.cs
@@ -1058,16 +1058,16 @@ public class Tests {
        }
        
        [DllImport ("libtest", EntryPoint="mono_test_marshal_ia64_pass_return_struct5")]
-       public static extern TestStruct5 mono_test_marshal_ia64_pass_return_struct5 (double d1, double d2, TestStruct5 s, double f3, double f4);
+       public static extern TestStruct5 mono_test_marshal_ia64_pass_return_struct5 (double d1, double d2, TestStruct5 s, int i, double f3, double f4);
 
        public static int test_0_ia64_struct5 () {
                TestStruct5 s = new TestStruct5 ();
                s.d1 = 5.0f;
                s.d2 = -5.0f;
 
-               TestStruct5 s2 = mono_test_marshal_ia64_pass_return_struct5 (1.0, 2.0, s, 3.0, 4.0);
+               TestStruct5 s2 = mono_test_marshal_ia64_pass_return_struct5 (1.0, 2.0, s, 5, 3.0, 4.0);
 
-               return (s2.d1 == 8.0 && s2.d2 == 2.0) ? 0 : 1;
+               return (s2.d1 == 13.0 && s2.d2 == 7.0) ? 0 : 1;
        }
 
        /* Test 6: Double HFA */