From: Raja R Harinath <harinath@hurrynot.org>
Date: Mon, 6 Jul 2009 19:21:33 +0000 (-0000)
Subject: Handle absense of ExecutionScope
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=ff3044bb4152732d3dde5d43b10bfe7a48a2fe15;p=mono.git

Handle absense of ExecutionScope

* ExpressionTest.cs (ExpressionDelegateTarget) [NET_4_0]: Disable
check for ExecutionScope.
(GlobalsInSpace) [NET_4_0]: Disable.

svn path=/trunk/mcs/; revision=137444
---

diff --git a/mcs/class/System.Core/Test/System.Linq.Expressions/ChangeLog b/mcs/class/System.Core/Test/System.Linq.Expressions/ChangeLog
index c073bde3347..3fc0edc8091 100644
--- a/mcs/class/System.Core/Test/System.Linq.Expressions/ChangeLog
+++ b/mcs/class/System.Core/Test/System.Linq.Expressions/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-07  Raja R Harinath  <harinath@hurrynot.org>
+
+	* ExpressionTest.cs (ExpressionDelegateTarget) [NET_4_0]: Disable
+	check for ExecutionScope.
+	(GlobalsInSpace) [NET_4_0]: Disable.
+
 2008-09-22  Jb Evain  <jbevain@novell.com>
 
 	* ExpressionTest_TypeIs.cs: add test for bug #428309.
diff --git a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest.cs b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest.cs
index 07629aabce2..200f5247d9c 100644
--- a/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest.cs
+++ b/mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest.cs
@@ -189,7 +189,9 @@ namespace MonoTests.System.Linq.Expressions {
 
 			Assert.AreEqual (typeof (Func<string, string>), identity.GetType ());
 			Assert.IsNotNull (identity.Target);
+#if !NET_4_0
 			Assert.AreEqual (typeof (ExecutionScope), identity.Target.GetType ());
+#endif
 		}
 
 		class Foo {
@@ -205,6 +207,7 @@ namespace MonoTests.System.Linq.Expressions {
 			}
 		}
 
+#if !NET_4_0
 		[Test]
 		[Category ("TargetJvmNotSupported")]
 		public void GlobalsInScope ()
@@ -237,6 +240,7 @@ namespace MonoTests.System.Linq.Expressions {
 
 			Assert.AreEqual ("gazonk42", del ());
 		}
+#endif
 
 		[Test]
 		public void SimpleHoistedParameter ()