Fixing last failing tests on Linux

Author: Jonathan Miller

src/Common/src/Interop/Linux/libc/Interop.statfs.cs

@@ -11,6 +11,9 @@ internal static partial class libc
         /// <summary>
         /// Internal FileSystem names and magic numbers taken from man(2) statfs
         /// </summary>
+        /// <remarks>
+        /// These value names MUST be kept in sync with those in DriveInfo.Unix.GetDriveType
+        /// </remarks>
         internal enum LinuxFileSystemTypes : long
         {
             adfs = 0xadf5,
@@ -69,23 +72,23 @@ internal unsafe struct fsid_t
         [StructLayout(LayoutKind.Sequential)]
         internal unsafe struct statfs
         {
-            internal int f_type;
-            internal int f_bsize;
+            internal long f_type;
+            internal long f_bsize;
             internal ulong f_blocks;
             internal ulong f_bfree;
             internal ulong f_bavail;
             internal ulong f_files;
             internal ulong f_ffree;
             internal fsid_t f_fsid;
-            internal int f_namelen;
-            internal int f_frsize;
-            internal int f_flags;
-            internal fixed int f_space[4];
+            internal long f_namelen;
+            internal long f_frsize;
+            internal long f_flags;
+            internal fixed long f_space[4];
         }
 
         internal static unsafe String GetMountPointFsType(statfs data)
         {
-            return data.f_type.ToString();
+            return ((LinuxFileSystemTypes)data.f_type).ToString();
         }
     }
 }

src/Common/src/Interop/Unix/libc/Interop.mountpoints.cs

@@ -53,6 +53,7 @@ internal static unsafe statfs GetStatFsForDriveName(string name)
             }
             else
             {
+                printf(System.Runtime.InteropServices.Marshal.SizeOf<statfs>().ToString() + "\r\n");
                 printf("Should be here\r\n");
                 return data;
             }

src/System.IO.FileSystem.DriveInfo/src/System/IO/DriveInfo.Unix.cs

@@ -8,9 +8,6 @@ namespace System.IO
 {
     public sealed partial class DriveInfo
     {
-        [DllImport("libc")]
-        static extern int printf(string data);
-
         private static string NormalizeDriveName(string driveName)
         {
             if (driveName.Contains("\0"))
@@ -30,7 +27,6 @@ public DriveType DriveType
             get
             {
                 Interop.libc.statfs data = Interop.libc.GetStatFsForDriveName(Name);
-                printf("Got data for name" + Name + "\r\n");
                 return GetDriveType(Interop.libc.GetMountPointFsType(data));
             }
         }
@@ -98,7 +94,6 @@ public String VolumeLabel
         /// <returns>The recognized drive type.</returns>
         private static DriveType GetDriveType(string fileSystemName)
         {
-            printf("Got type of " + fileSystemName + "\r\n");
             // This list is based primarily on "man fs", "man mount", "mntent.h", "/proc/filesystems",
             // and "wiki.debian.org/FileSystem". It can be extended over time as we 
             // find additional file systems that should be recognized as a particular drive type.

src/System.IO.FileSystem.DriveInfo/tests/DriveInfo.Unix.Tests.cs

@@ -8,9 +8,6 @@ namespace System.IO.FileSystem.DriveInfoTests
 {
     public partial class DriveInfoUnixTests
     {
-        [Runtime.InteropServices.DllImport("libc")]
-        private static extern int printf(string data);
-
         [Fact]
         [PlatformSpecific(PlatformID.AnyUnix)]
         public void TestConstructor()
@@ -54,15 +51,10 @@ public void TestProperties()
             Assert.Equal("/", root.Name);
             Assert.Equal("/", root.RootDirectory.FullName);
             Assert.Equal(DriveType.Fixed, root.DriveType);
-            printf("Checked type\r\n");
             Assert.True(root.IsReady);
-            printf("Checked if ready\r\n");
             Assert.True(root.AvailableFreeSpace > 0);
-            printf("Checked free space\r\n");
             Assert.True(root.TotalFreeSpace > 0);
-            printf("checked total space\r\n");
             Assert.True(root.TotalSize > 0);
-            printf("done\r\n");
         }
     }
 }