2008-03-14 Marek Safar <marek.safar@gmail.com>

	* compiler-tester.cs: Replaced XmlTextWriter and XmlTextReader with
	XmlWriter and XmlReader.

svn path=/trunk/mcs/; revision=98263

diff --git a/mcs/tools/compiler-tester/ChangeLog b/mcs/tools/compiler-tester/ChangeLog
index 6bbf5f43d592f55efe7ea19f1d6b3a3501f6b3ba..d614e9385fc515d70b080a4564b425a2f5fcc52f 100644 (file)
--- a/mcs/tools/compiler-tester/ChangeLog
+++ b/mcs/tools/compiler-tester/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-14  Marek Safar  <marek.safar@gmail.com>
+
+       * compiler-tester.cs: Replaced XmlTextWriter and XmlTextReader with
+       XmlWriter and XmlReader.
+
 2008-03-14  Marek Safar  <marek.safar@gmail.com>
 
        * compiler-tester.cs: Added IL regression support.

diff --git a/mcs/tools/compiler-tester/compiler-tester.cs b/mcs/tools/compiler-tester/compiler-tester.cs
index 4ce902294979b9e4833ed1af8950b6cf797a75c8..973c0e5530011448018ae5a8c9e2667ec166fa79 100644 (file)
--- a/mcs/tools/compiler-tester/compiler-tester.cs
+++ b/mcs/tools/compiler-tester/compiler-tester.cs
@@ -183,7 +183,7 @@ namespace TestRunner {
                        }
 
 #if NET_2_0                    
-                       public static VerificationData FromFile (string name, XmlTextReader r)
+                       public static VerificationData FromFile (string name, XmlReader r)
                        {
                                VerificationData tc = new VerificationData (name);
                                ArrayList methods = new ArrayList ();
@@ -862,7 +862,7 @@ namespace TestRunner {
                {
                        LogLine ("Loading verification data {0} ...", file);
 
-                       using (XmlTextReader r = new XmlTextReader (file)) {
+                       using (XmlReader r = XmlReader.Create (file)) {
                                r.ReadStartElement ("tests");
                                verif_data = new Hashtable ();
 
@@ -875,16 +875,15 @@ namespace TestRunner {
                                        verif_data.Add (name, tc);
                                }
                        }
-                       throw new NotSupportedException ();
                }
 
                void UpdateVerificationData (string file)
                {
                        LogLine ("Updating verification data {0}...", file);
 
-                       using (XmlTextWriter w = new XmlTextWriter (file, null)) {
-                               w.Formatting = Formatting.Indented;
-
+                       XmlWriterSettings s = new XmlWriterSettings ();
+                       s.Indent = true;
+                       using (XmlWriter w = XmlWriter.Create (file, s)) {
                                w.WriteStartDocument ();
                                w.WriteComment ("This file contains expected IL and metadata produced by compiler for each test");
                                w.WriteStartElement ("tests");