Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@ -247,8 +247,8 @@ namespace MonoTests.System.Runtime.CompilerServices
return res.Result;
}
#if !MOBILE_STATIC
[Test]
[Ignore ("Incompatible with nunitlite")]
public void FinishedTaskOnCompleted ()
{
var mres = new ManualResetEvent (false);
@ -268,12 +268,10 @@ 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");;
}
#endif
[Test]
public void CompletionOnSameCustomSynchronizationContext ()
{