Author: atsushi
Date: 2006-01-18 03:07:28 -0500 (Wed, 18 Jan 2006)
New Revision: 55707
Modified:
trunk/mcs/class/corlib/System.IO/ChangeLog
trunk/mcs/class/corlib/System.IO/DirectoryInfo.cs
trunk/mcs/class/corlib/Test/System.IO/ChangeLog
trunk/mcs/class/corlib/Test/System.IO/DirectoryInfoTest.cs
Log:
2006-01-18 Atsushi Enomoto <[EMAIL PROTECTED]>
* DirectoryInfo.cs : on Windows top directory is something like c:\.
* DirectoryInfoTest.cs : don't expect "/" as a top directory on
Windows.
Modified: trunk/mcs/class/corlib/System.IO/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.IO/ChangeLog 2006-01-18 06:27:40 UTC (rev
55706)
+++ trunk/mcs/class/corlib/System.IO/ChangeLog 2006-01-18 08:07:28 UTC (rev
55707)
@@ -1,3 +1,7 @@
+2006-01-18 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * DirectoryInfo.cs : on Windows top directory is something like c:\.
+
2006-01-17 Joshua Tauberer <[EMAIL PROTECTED]>
* StreamReader.cs: Avoid two totally unnecessary string creations.
Modified: trunk/mcs/class/corlib/System.IO/DirectoryInfo.cs
===================================================================
--- trunk/mcs/class/corlib/System.IO/DirectoryInfo.cs 2006-01-18 06:27:40 UTC
(rev 55706)
+++ trunk/mcs/class/corlib/System.IO/DirectoryInfo.cs 2006-01-18 08:07:28 UTC
(rev 55707)
@@ -65,7 +65,7 @@
parent = null;
} else {
current = FullPath.Substring (last + 1, len -
last);
- if (last == 0)
+ if (last == 0 &&
!Environment.IsRunningOnWindows)
parent = Path.DirectorySeparatorStr;
else
parent = FullPath.Substring (0, last);
Modified: trunk/mcs/class/corlib/Test/System.IO/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/Test/System.IO/ChangeLog 2006-01-18 06:27:40 UTC
(rev 55706)
+++ trunk/mcs/class/corlib/Test/System.IO/ChangeLog 2006-01-18 08:07:28 UTC
(rev 55707)
@@ -1,3 +1,8 @@
+2006-01-18 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * DirectoryInfoTest.cs : don't expect "/" as a top directory on
+ Windows.
+
2006-01-13 Ben Maurer <[EMAIL PROTECTED]>
* TextWriterTest.cs: Make sure TextWriter calls the char[],int,int
Modified: trunk/mcs/class/corlib/Test/System.IO/DirectoryInfoTest.cs
===================================================================
--- trunk/mcs/class/corlib/Test/System.IO/DirectoryInfoTest.cs 2006-01-18
06:27:40 UTC (rev 55706)
+++ trunk/mcs/class/corlib/Test/System.IO/DirectoryInfoTest.cs 2006-01-18
08:07:28 UTC (rev 55707)
@@ -766,7 +766,11 @@
public void Parent_Bug77090 ()
{
DirectoryInfo di = new DirectoryInfo ("/home");
- AssertEquals ("/home parent", "/", di.Parent.Name);
+ if (Path.DirectorySeparatorChar == '\\') {
+ Assert ("/home parent (Windows path)",
di.Parent.Name.EndsWith (":\\"));
+ }
+ else
+ AssertEquals ("/home parent", "/",
di.Parent.Name);
AssertNull ("/home parent parent", di.Parent.Parent);
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
