Merge branch 'master' of github.com:tgiphil/mono

[mono.git] / mcs / class / System.XML / Test / System.Xml / XmlResolverTest.cs

diff --git a/mcs/class/System.XML/Test/System.Xml/XmlResolverTest.cs b/mcs/class/System.XML/Test/System.Xml/XmlResolverTest.cs
index b4358abcc7e30fc85afa397b61207065de3dc421..5865dbe07bc7c3ddbd49b5ed4f835450ec64038b 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml/XmlResolverTest.cs
+++ b/mcs/class/System.XML/Test/System.Xml/XmlResolverTest.cs
@@ -74,9 +74,11 @@ namespace MonoTest.System.Xml {
                        Uri uri = xr.ResolveUri (null, "/Moonlight");
                        // note: this is *very* different from [silver|moon]light
                        Assert.IsTrue (uri.IsAbsoluteUri, "null,string");
-                       if (isWin32)
-                               Assert.AreEqual ("file:///C:/Moonlight", uri.ToString (), "ToString");
-                       else
+                       if (isWin32) {
+                               string currentdir = Directory.GetCurrentDirectory ();
+                               string volume = currentdir.Substring (0, 2);
+                               Assert.AreEqual ("file:///" + volume + "/Moonlight", uri.ToString (), "ToString");
+                       } else
                                Assert.AreEqual ("file:///Moonlight", uri.ToString (), "ToString");
 
                        uri = new Uri ("http://www.mono-project.com");
@@ -101,6 +103,6 @@ namespace MonoTest.System.Xml {
                        u2 = xr.ResolveUri (null, "file:///mystuff");
                        Assert.IsTrue (u2.IsAbsoluteUri, "null,absolute/file");
                }
-#endif
+#endif\r
        }
 }