merge -r 61110:61111

[mono.git] / mcs / class / corlib / Test / System.IO / DirectoryInfoTest.cs

diff --git a/mcs/class/corlib/Test/System.IO/DirectoryInfoTest.cs b/mcs/class/corlib/Test/System.IO/DirectoryInfoTest.cs
index 8d3dbb1cce71b3f470492b3b1e104cd0358887e7..766ad1b17e0b1ef757e4c643973aa6213b93e068 100644 (file)
--- a/mcs/class/corlib/Test/System.IO/DirectoryInfoTest.cs
+++ b/mcs/class/corlib/Test/System.IO/DirectoryInfoTest.cs
@@ -766,7 +766,11 @@ namespace MonoTests.System.IO
                public void Parent_Bug77090 ()\r
                {
                        DirectoryInfo di = new DirectoryInfo ("/home");\r
-                       AssertEquals ("/home parent", "/", di.Parent.Name);\r
+                       if (Path.DirectorySeparatorChar == '\\') {\r
+                               Assert ("/home parent (Windows path)", di.Parent.Name.EndsWith (":\\"));\r
+                       }\r
+                       else\r
+                               AssertEquals ("/home parent", "/", di.Parent.Name);\r
                        AssertNull ("/home parent parent", di.Parent.Parent);\r
                }\r
        }\r