diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2009-12-17 17:53:39 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2009-12-17 17:53:39 +0300 |
| commit | 82f0bcaa7d8b11ba1efd670196b132c1023cbc5f (patch) | |
| tree | 47da007a5b4a74bd9a77eaef8f851f52b5b570fa | |
| parent | 3e13cdf770d95c9012b758f77aec9a14a0d4f040 (diff) | |
Fix 1.1 build (previous test was 2.0-only, so it couldn't be simply backported).
svn path=/branches/mono-2-6/mcs/; revision=148705
| -rw-r--r-- | mcs/class/System.XML/Test/System.Xml/ChangeLog | 4 | ||||
| -rw-r--r-- | mcs/class/System.XML/Test/System.Xml/XmlTextReaderTests.cs | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mcs/class/System.XML/Test/System.Xml/ChangeLog b/mcs/class/System.XML/Test/System.Xml/ChangeLog index 0ea8c18abfe..ad890283509 100644 --- a/mcs/class/System.XML/Test/System.Xml/ChangeLog +++ b/mcs/class/System.XML/Test/System.Xml/ChangeLog @@ -1,3 +1,7 @@ +2009-12-17 Atsushi Enomoto <atsushi@ximian.com> + + * XmlTextReaderTests.cs : fix 1.1 build (only 2.6 branch). + 2009-11-13 Andreia Gaita <avidigal@novell.com> * XmlTextReaderTests.cs: Added ParsingWithNSMgrSubclass test to check diff --git a/mcs/class/System.XML/Test/System.Xml/XmlTextReaderTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlTextReaderTests.cs index 21c49abfff6..96ad062bb85 100644 --- a/mcs/class/System.XML/Test/System.Xml/XmlTextReaderTests.cs +++ b/mcs/class/System.XML/Test/System.Xml/XmlTextReaderTests.cs @@ -1305,6 +1305,7 @@ namespace MonoTests.System.Xml xtr.Read (); } +#if NET_2_0 [Test] public void ParsingWithNSMgrSubclass () { @@ -1321,7 +1322,6 @@ namespace MonoTests.System.Xml } - // The MyNS subclass chains namespace lookups class MyNS : XmlNamespaceManager { private XmlReader xr; @@ -1341,5 +1341,6 @@ namespace MonoTests.System.Xml return String.Empty; } } +#endif } } |