Merge pull request #463 from strawd/concurrent-requests

[mono.git] / mcs / class / corlib / Test / System.Reflection.Emit / GenericTypeParameterBuilderTest.cs

diff --git a/mcs/class/corlib/Test/System.Reflection.Emit/GenericTypeParameterBuilderTest.cs b/mcs/class/corlib/Test/System.Reflection.Emit/GenericTypeParameterBuilderTest.cs
index b62b419b0309b176cef0ff484c2cabb1e3b876f4..815c34c5cba9ec72421d19720eee89a0881da33c 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection.Emit/GenericTypeParameterBuilderTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection.Emit/GenericTypeParameterBuilderTest.cs
@@ -27,7 +27,6 @@ namespace MonoTests.System.Reflection.Emit
        {
                AssemblyBuilder assembly;
                ModuleBuilder module;
-               int typeCount;
                static string ASSEMBLY_NAME = "MonoTests.System.Reflection.Emit.TypeBuilderTest";
 
                [SetUp]
@@ -46,7 +45,6 @@ namespace MonoTests.System.Reflection.Emit
                                        assemblyName, mode, Path.GetTempPath ());
 
                        module = assembly.DefineDynamicModule ("module1");
-                       typeCount = 0;
                }
 
                [Test]
@@ -79,11 +77,7 @@ namespace MonoTests.System.Reflection.Emit
                                Assert.Fail ("#11");
                        } catch (NotSupportedException) {}
 
-                       try {
-                                       var x = gparam.Attributes;
-                                       Assert.Fail ("#12");
-                       } catch (NotSupportedException) {}
-
+                       Assert.AreEqual (TypeAttributes.Public, gparam.Attributes, "#12");
                        Assert.IsFalse (gparam.HasElementType, "#13");
                        Assert.IsFalse (gparam.IsArray, "#14");
                        Assert.IsFalse (gparam.IsByRef, "#15");
@@ -348,10 +342,9 @@ namespace MonoTests.System.Reflection.Emit
                        Assert.IsFalse (gparam.IsGenericTypeDefinition, "#10");
                }
 
-#if !NET_4_0
-               [Category ("NotDotNet")]
-#endif
                [Test]
+               // CompilerContext no longer supported
+               [Category ("NotWorking")]
                public void GetAttributeFlagsImpl ()
                {
                        SetUp (AssemblyBuilderAccess.RunAndSave  | (AssemblyBuilderAccess)0x800);