Merge pull request #2023 from VSadov/fix1544

VSadov · VSadov · commit 6504501399c6 · 2015-06-12T14:23:07.000-07:00
Makes static fields used by multiple tests ThreadStatic
diff --git a/src/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.indexer.genclass.cs b/src/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.indexer.genclass.cs
@@ -29,6 +29,7 @@ public enum MyEnum
 
     public class MemberClass<T>
     {
+        [ThreadStatic]
         public static int Status;
         public bool? this[string p1, float p2, short[] p3]
         {
@@ -238,6 +239,7 @@ public class MemberClassMultipleParams<T, U, V>
     public class MemberClassWithClassConstraint<T>
         where T : class
     {
+        [ThreadStatic]
         public static int Status;
         public int this[int x]
         {
@@ -271,6 +273,7 @@ public int this[int x]
     public class MemberClassWithNewConstraint<T>
         where T : new()
     {
+        [ThreadStatic]
         public static int Status;
         public dynamic this[T t]
         {
diff --git a/src/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.genclass.cs b/src/System.Dynamic.Runtime/tests/Dynamic.Context/Conformance.dynamic.context.operator.genclass.cs
@@ -236,7 +236,6 @@ public class MemberClassWithNewConstraint<T>
     public class MemberClassWithAnotherTypeConstraint<T, U>
         where T : U
     {
-        public static int Status;
         public static implicit operator MyStruct[] (MemberClassWithAnotherTypeConstraint<T, U> p1)
         {
             return new MyStruct[]

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public enum MyEnum`
`29`	`29`
`30`	`30`	`public class MemberClass<T>`
`31`	`31`	`{`
	`32`	`+ [ThreadStatic]`
`32`	`33`	`public static int Status;`
`33`	`34`	`public bool? this[string p1, float p2, short[] p3]`
`34`	`35`	`{`
`@@ -238,6 +239,7 @@ public class MemberClassMultipleParams<T, U, V>`
`238`	`239`	`public class MemberClassWithClassConstraint<T>`
`239`	`240`	`where T : class`
`240`	`241`	`{`
	`242`	`+ [ThreadStatic]`
`241`	`243`	`public static int Status;`
`242`	`244`	`public int this[int x]`
`243`	`245`	`{`
`@@ -271,6 +273,7 @@ public int this[int x]`
`271`	`273`	`public class MemberClassWithNewConstraint<T>`
`272`	`274`	`where T : new()`
`273`	`275`	`{`
	`276`	`+ [ThreadStatic]`
`274`	`277`	`public static int Status;`
`275`	`278`	`public dynamic this[T t]`
`276`	`279`	`{`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,6 @@ public class MemberClassWithNewConstraint<T>`
`236`	`236`	`public class MemberClassWithAnotherTypeConstraint<T, U>`
`237`	`237`	`where T : U`
`238`	`238`	`{`
`239`		`- public static int Status;`
`240`	`239`	`public static implicit operator MyStruct[] (MemberClassWithAnotherTypeConstraint<T, U> p1)`
`241`	`240`	`{`
`242`	`241`	`return new MyStruct[]`