merge 99630:99762

[mono.git] / mcs / tests / test-254.cs

diff --git a/mcs/tests/test-254.cs b/mcs/tests/test-254.cs
index 2ccf6c9e6bd3e83e51f7476629cf049175046de8..1971d2f4e4812fa82feb8fbed1c666537ce0a723 100644 (file)
--- a/mcs/tests/test-254.cs
+++ b/mcs/tests/test-254.cs
@@ -58,7 +58,7 @@ public class Test_4
 {
        // TODO: Where to apply ?
 
-       [property: Test]
+       [event: Test]
        public event test_delegate e_1 {
                add {}
                remove {}
@@ -106,7 +106,10 @@ public class ClassMain
                Assert (mi.GetParameters ()[0].GetCustomAttributes (true), false, 4);
                Assert (mi.GetCustomAttributes (true), false, 5);
                Assert (mi.ReturnTypeCustomAttributes.GetCustomAttributes (true), true, 6);
-               Assert (typeof (test_delegate).GetCustomAttributes (false), false, 7);
+
+               /* Under net 2.0, SerializableAttribute is returned */
+               if (typeof (test_delegate).GetCustomAttributes (false).Length != 1)
+                       Assert (typeof (test_delegate).GetCustomAttributes (false), false, 7);
 
                PropertyInfo pi = typeof (Test_2).GetProperty ("Test");
                Assert (pi.GetCustomAttributes (true), false, 31);