Fix two Marshal tests to not hardcode OSX libc

Don't hardcode OSX path to libc.dylib, we can just use libc in the DllImport.

Fix the signature to return an IntPtr and do marshalling of the string correctly.

diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshal/marshalgetlastwin32error.cs b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshal/marshalgetlastwin32error.cs
index 7bf038f..db55bde 100644 (file)
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshal/marshalgetlastwin32error.cs
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshal/marshalgetlastwin32error.cs
@@ -29,12 +29,11 @@ public class MarshalGetLastWin32Error
             retVal = PosTest2() && retVal;
             retVal = PosTest3() && retVal;
         }
-#if !WinCoreSys
         else
         {
-            retVal = PosMacTest1() && retVal;
+            retVal = PosNonWinTest1() && retVal;
         }
-#endif
+
         return retVal;
     }
 
@@ -144,8 +143,7 @@ public class MarshalGetLastWin32Error
 
         return retVal;
     }
-#if !WinCoreSys
-    public bool PosMacTest1()
+    public bool PosNonWinTest1()
     {
         bool   retVal = true;
         string pwd    = null;
@@ -154,7 +152,7 @@ public class MarshalGetLastWin32Error
 
         try
         {
-            pwd = getenv("PWD");
+            pwd = Marshal.PtrToStringUni(getenv("PWD"));
 
             if (Marshal.GetLastWin32Error() != 0)
             {
@@ -170,7 +168,6 @@ public class MarshalGetLastWin32Error
 
         return retVal;
     }
-#endif
     #endregion
     #endregion
 
@@ -196,11 +193,9 @@ public class MarshalGetLastWin32Error
 
     #region Private Methods
 
-#if !WinCoreSys
     [SecurityCritical]
-    [DllImport("/usr/lib/libc.dylib")]
-    private static extern string getenv(string key);
-#endif
+    [DllImport("libc")]
+    private static extern IntPtr getenv(string key);
 
     [DllImport("kernel32.dll", SetLastError = true)]
     private extern static void SetLastError(uint dwErrCode);

diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshal/marshalreadint641.cs b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshal/marshalreadint641.cs
index ee48c0c..a62e9df 100644 (file)
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshal/marshalreadint641.cs
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshal/marshalreadint641.cs
@@ -99,10 +99,10 @@ public class MarshalReadInt641
     #endregion
 
     #region Macintosh P/invoke Declarations
-    [DllImport("libc.dylib")]
+    [DllImport("libc")]
     private static extern IntPtr malloc(uint siz);
 
-    [DllImport("libc.dylib")]
+    [DllImport("libc")]
     private static extern void free(IntPtr ptr);
     #endregion