[corlib] Fix a test. It was broken in so many ways, but hidden behind…

… a check that disabled it everywhere. :(

mcs/class/corlib/Test/System.Globalization/CultureInfoTest.cs

@@ -625,7 +625,7 @@ public void ChineseSimplifiedDontEqual ()
 
 #if NET_4_5
 		CountdownEvent barrier = new CountdownEvent (3);
-		AutoResetEvent[] evt = new AutoResetEvent [] { new AutoResetEvent (false), new AutoResetEvent (false), new AutoResetEvent (false)};
+		AutoResetEvent[] evt = new AutoResetEvent [] { new AutoResetEvent (false), new AutoResetEvent (false), new AutoResetEvent (false), new AutoResetEvent (false)};
 
 		CultureInfo[] initial_culture = new CultureInfo[4];
 		CultureInfo[] changed_culture = new CultureInfo[4];
@@ -668,13 +668,10 @@ void ThreadPoolWithoutChange () {
 
 		[Test]
 		public void DefaultThreadCurrentCulture () {
+			Console.WriteLine ("HELLO");
 			var orig_culture = CultureInfo.CurrentCulture;
 			var new_culture = new CultureInfo("fr-FR");
 
-			// The test doesn't work if the current culture is already set
-			if (orig_culture != CultureInfo.InvariantCulture)
-				Assert.Ignore ("The test doesn't work if the current culture is already set.");
-
 			/* Phase 0 - warm up */
 			new Thread (ThreadWithoutChange).Start ();
 			new Thread (ThreadWithChange).Start ();
@@ -688,19 +685,20 @@ public void DefaultThreadCurrentCulture () {
 
 			/* Phase 2 - change the default culture*/
 			CultureInfo.DefaultThreadCurrentCulture = new_culture;
-			evt [0].Set ();
 			evt [1].Set ();
 			evt [2].Set ();
+			evt [3].Set ();
+
 			/* Phase 3 - let everyone witness the new value */
 			changed_culture [0] = CultureInfo.CurrentCulture;
 			barrier.Wait ();
 			barrier.Reset ();
 
 			/* Phase 4 - revert the default culture back to null */
 			CultureInfo.DefaultThreadCurrentCulture = null;
-			evt [0].Set ();
 			evt [1].Set ();
 			evt [2].Set ();
+			evt [3].Set ();
 
 			/* Phase 5 - let everyone witness the new value */
 			changed_culture2 [0] = CultureInfo.CurrentCulture;
@@ -719,7 +717,7 @@ public void DefaultThreadCurrentCulture () {
 			Assert.AreEqual (alternative_culture, changed_culture [2], "#7");
 			Assert.AreEqual (new_culture, changed_culture [3], "#8");
 
-			Assert.AreEqual (orig_culture, changed_culture [0], "#9");
+			Assert.AreEqual (orig_culture, changed_culture2 [0], "#9");
 			Assert.AreEqual (orig_culture, changed_culture2 [1], "#10");
 			Assert.AreEqual (alternative_culture, changed_culture2 [2], "#11");
 			Assert.AreEqual (orig_culture, changed_culture2 [3], "#12");