Merge pull request #439 from mono-soc-2012/garyb/iconfix

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

diff --git a/mcs/class/corlib/Test/System.Text/EncodingInfoTest.cs b/mcs/class/corlib/Test/System.Text/EncodingInfoTest.cs
old mode 100755 (executable)
new mode 100644 (file)
index 36b9bec..91f7015
--- a/mcs/class/corlib/Test/System.Text/EncodingInfoTest.cs
+++ b/mcs/class/corlib/Test/System.Text/EncodingInfoTest.cs
@@ -40,11 +40,8 @@ namespace MonoTests.System.Text
 
                        List<int> list = new List<int> ();
                        for (int i = 1; i < 0x10000; i++) {
-                               try {
-                                       Encoding.GetEncoding (i);
-                                       list.Add (i);
-                               } catch {
-                               }
+                               // Do this in a method to work around #5432
+                               GetEncoding (i, list);
                        }
                        int [] reference = list.ToArray ();
 
@@ -63,6 +60,14 @@ namespace MonoTests.System.Text
                        foreach (EncodingInfo i in Encoding.GetEncodings ())
                                Assert.IsNotNull (i.GetEncoding (), "codepage " + i);
                }
+
+               void GetEncoding (int id, List<int> list) {
+                       try {
+                               Encoding.GetEncoding (id);
+                               list.Add (id);
+                       } catch {
+                       }
+               }
        }
 }