Merge pull request #3796 from ntherning/windows-backend-for-MemoryMappedFile

[mono.git] / mcs / class / corlib / Test / System.Runtime.CompilerServices / TaskAwaiterTest.cs

diff --git a/mcs/class/corlib/Test/System.Runtime.CompilerServices/TaskAwaiterTest.cs b/mcs/class/corlib/Test/System.Runtime.CompilerServices/TaskAwaiterTest.cs
index 6139c1938810a822d38c6e4e9a49c747dc327091..6a6ecc0b36d66e4bb24febc722b64536c5935179 100644 (file)
--- a/mcs/class/corlib/Test/System.Runtime.CompilerServices/TaskAwaiterTest.cs
+++ b/mcs/class/corlib/Test/System.Runtime.CompilerServices/TaskAwaiterTest.cs
@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_5
 
 using System;
 using System.Threading;
@@ -249,6 +248,7 @@ namespace MonoTests.System.Runtime.CompilerServices
                }
 
                [Test]
+               [Ignore ("Incompatible with nunitlite")]
                public void FinishedTaskOnCompleted ()
                {
                        var mres = new ManualResetEvent (false);
@@ -268,7 +268,7 @@ namespace MonoTests.System.Runtime.CompilerServices
 
                        mres.Set ();
                        // this will only terminate correctly if the test was not executed from the main thread
-                       // e.g. Touch.Unit defaults to run tests on the main thread and this will return false
+                       // e.g. nunitlite/Touch.Unit defaults to run tests on the main thread and this will return false
                        Assert.AreEqual (Thread.CurrentThread.IsBackground, mres2.WaitOne (2000), "#2");;
                }
 
@@ -368,7 +368,10 @@ namespace MonoTests.System.Runtime.CompilerServices
                public void NestedLeakingSynchronizationContext ()
                {
                        var sc = SynchronizationContext.Current;
-                       NestedLeakingSynchronizationContext_MainAsync (sc).GetAwaiter ().GetResult ();
+                       if (sc == null)
+                               Assert.IsTrue (NestedLeakingSynchronizationContext_MainAsync (sc).Wait (5000), "#1");
+                       else
+                               Assert.Ignore ("NestedSynchronizationContext may never complete on custom context");
                }
 
                static async Task NestedLeakingSynchronizationContext_MainAsync (SynchronizationContext sc)
@@ -390,4 +393,3 @@ namespace MonoTests.System.Runtime.CompilerServices
        }
 }
 
-#endif