Merge pull request #3562 from BrzVlad/fix-reverse-wbarrier

[mono.git] / mcs / class / corlib / Test / System / LazyTest.cs

diff --git a/mcs/class/corlib/Test/System/LazyTest.cs b/mcs/class/corlib/Test/System/LazyTest.cs
index b55f9025ed734d5fe9cdc26b1d3250f8e1215575..0b3e042e3097b6021ea395e5e2c7987f5c07f222 100644 (file)
--- a/mcs/class/corlib/Test/System/LazyTest.cs
+++ b/mcs/class/corlib/Test/System/LazyTest.cs
@@ -26,11 +26,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_0
-
 using System;
 using System.Reflection;
-using System.Reflection.Emit;
 using System.Threading;
 using NUnit.Framework;
 
@@ -114,26 +111,37 @@ namespace MonoTests.System
                static int counter;
 
                [Test]
-               public void EnsureSingleThreadSafeExecution () {
+               public void EnsureSingleThreadSafeExecution ()
+               {
                        counter = 42;
+                       bool started = false;
 
                        var l = new Lazy<int> (delegate () { return counter ++; }, true);
-
+                       bool failed = false;
                        object monitor = new object ();
-                       var threads = new Thread [10];
-                       for (int i = 0; i < 10; ++i) {
+                       var threads = new Thread [4];
+                       for (int i = 0; i < threads.Length; ++i) {
                                threads [i] = new Thread (delegate () {
                                                lock (monitor) {
-                                                       Monitor.Wait (monitor);
+                                                       if (!started) {
+                                                               if (!Monitor.Wait (monitor, 2000))
+                                                                       failed = true;
+                                                       }
                                                }
                                                int val = l.Value;
                                        });
                        }
-                       for (int i = 0; i < 10; ++i)
+                       for (int i = 0; i < threads.Length; ++i)
                                threads [i].Start ();
-                       lock (monitor)
+                       lock (monitor) {
+                               started = true;
                                Monitor.PulseAll (monitor);
-                       
+                       }
+
+                       for (int i = 0; i < threads.Length; ++i)
+                               threads [i].Join ();
+
+                       Assert.IsFalse (failed);
                        Assert.AreEqual (42, l.Value);
                }
                
@@ -274,6 +282,7 @@ namespace MonoTests.System
                public void ConcurrentInitialization ()
                {
                        var init = new AutoResetEvent (false);
+                       var e1_set = new AutoResetEvent (false);
 
                        var lazy = new Lazy<string> (() => {
                                init.Set ();
@@ -287,6 +296,7 @@ namespace MonoTests.System
                                        string value = lazy.Value;
                                } catch (Exception ex) {
                                        e1 = ex;
+                                       e1_set.Set ();
                                }
                        });
                        thread.Start ();
@@ -307,11 +317,10 @@ namespace MonoTests.System
                                e3 = ex;
                        }
 
-                       Assert.AreSame (e1, e2, "#2");
-                       Assert.AreSame (e1, e3, "#3");
+                       Assert.IsTrue (e1_set.WaitOne (3000), "#2");
+                       Assert.AreSame (e1, e2, "#3");
+                       Assert.AreSame (e1, e3, "#4");
                }
 
        }
 }
-
-#endif