diff options
| author | Marek Safar <marek.safar@gmail.com> | 2016-12-02 14:06:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-02 14:06:53 +0300 |
| commit | 673f1ba3e1bb08b3b7be9ce1aba0df7869cffaca (patch) | |
| tree | 41002c9b016b01aeaf9c3e7b117f39a10ffe2e6f /mcs/class/System.Web | |
| parent | 68d56e8027809791b7ff64153bd0a77f9b408075 (diff) | |
| parent | 0a53e226313b2e89dd05272ea403994561067a78 (diff) | |
Merge pull request #4063 from ntherning/fix-culture-info-problem-in-RepeatInfoTest
Ensure the System.Web.UI.WebControls.RepeatInfo_Autogen test runs under en-US
Diffstat (limited to 'mcs/class/System.Web')
| -rw-r--r-- | mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.auto.4.0.cs | 3 | ||||
| -rw-r--r-- | mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.gen.cs | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.auto.4.0.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.auto.4.0.cs index a3772412270..968e5c214c5 100644 --- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.auto.4.0.cs +++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.auto.4.0.cs @@ -1,7 +1,7 @@ // THIS IS AUTOGENERATED DO NOT EDIT // -// Generated on Microsoft .NET runtime v4.0.30319.1 +// Generated on Microsoft .NET runtime v4.0.30319.42000 // // Authors: // Ben Maurer (bmaurer@novell.com) @@ -42,6 +42,7 @@ using MonoTests.Helpers; namespace MonoTests.System.Web.UI.WebControls { [TestFixture] +[SetCulture ("en-us")] public class RepeatInfo_Autogen { [Test] diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.gen.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.gen.cs index 4d87fce7d59..a06b3be9cd9 100644 --- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.gen.cs +++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/RepeatInfoTest.gen.cs @@ -57,7 +57,6 @@ class X { static void Main () { - Console.WriteLine ("#if NET_4_0"); bool isMono = Type.GetType ("Mono.Runtime", false) != null; Console.WriteLine (@" @@ -104,6 +103,7 @@ using MonoTests.Helpers; namespace MonoTests.System.Web.UI.WebControls {{ [TestFixture] +[SetCulture (""en-us"")] public class RepeatInfo_Autogen {{ ", isMono ? "Mono" : "Microsoft .NET", Environment.Version); int num = 0; @@ -180,8 +180,7 @@ public class RepeatInfo_Autogen {{ } Console.WriteLine (@" } -} -#endif"); +}"); } static void BuildTestCode (StringBuilder sb, Exception ex, int cols, int cnt, RepeatDirection d, RepeatLayout l, bool oti, bool hdr, bool ftr, bool sep, string exp, int num) |