Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-03 10:59:49 +00:00
parent a569aebcfd
commit e79aa3c0ed
17047 changed files with 3137615 additions and 392334 deletions

View File

@ -109,7 +109,7 @@ namespace MonoTests.System.Threading
}
// check a class in mscorlib to determine if we're running on Mono
if (Type.GetType ("System.MonoType", false) != null)
if (Type.GetType ("Mono.Runtime", false) != null)
is_mono = true;
}
@ -574,37 +574,6 @@ namespace MonoTests.System.Threading
t.Name = "b";
}
bool rename_finished;
bool rename_failed;
[Test]
public void RenameTpThread ()
{
object monitor = new object ();
ThreadPool.QueueUserWorkItem (new WaitCallback (Rename_callback), monitor);
lock (monitor) {
if (!rename_finished)
Monitor.Wait (monitor);
}
Assert.IsTrue (!rename_failed);
}
void Rename_callback (object o) {
Thread.CurrentThread.Name = "a";
try {
Thread.CurrentThread.Name = "b";
//Console.WriteLine ("Thread name is: {0}", Thread.CurrentThread.Name);
} catch (Exception e) {
//Console.Error.WriteLine (e);
rename_failed = true;
}
object monitor = o;
lock (monitor) {
rename_finished = true;
Monitor.Pulse (monitor);
}
}
[Test]
public void TestNestedThreads1()
{