Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@ -128,7 +128,11 @@ namespace MonoTests.System.Threading
TestUtil.WaitForNotAlive (thread1, "");
Assert.AreEqual (100, class1.marker);
} finally {
#if MONO_FEATURE_THREAD_ABORT
thread1.Abort ();
#else
thread1.Interrupt ();
#endif
}
}
@ -150,8 +154,13 @@ namespace MonoTests.System.Threading
Assert.AreEqual (class2.id, class2.marker);
} finally {
#if MONO_FEATURE_THREAD_ABORT
thread1.Abort ();
thread2.Abort ();
#else
thread1.Interrupt ();
thread2.Interrupt ();
#endif
}
}