Merge branch 'master' into msbuilddll2

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

diff --git a/mcs/class/corlib/Test/System.Globalization/CultureInfoTest.cs b/mcs/class/corlib/Test/System.Globalization/CultureInfoTest.cs
index d3eb606883fabda93b0cc2429bdfd13adf15ee95..45fd5d0e99ce526876998635219099707db107f0 100644 (file)
--- a/mcs/class/corlib/Test/System.Globalization/CultureInfoTest.cs
+++ b/mcs/class/corlib/Test/System.Globalization/CultureInfoTest.cs
@@ -648,7 +648,10 @@ namespace MonoTests.System.Globalization
                        var orig_culture = CultureInfo.CurrentCulture;
                        var new_culture = new CultureInfo("fr-FR");
 
-                       Console.WriteLine (orig_culture.IsReadOnly);
+                       // The test doesn't work if the current culture is already set
+                       if (orig_culture != CultureInfo.InvariantCulture)
+                               return;
+
                        /* Phase 0 - warm up */
                        new Thread (ThreadWithoutChange).Start ();
                        new Thread (ThreadWithChange).Start ();