Merge pull request #180 from jasonwilliams200OK/master

xplat: Adds FreeBSD support
dotnet · Jun 23, 2015 · 7708c93 · 7708c93
2 parents c629653 + e5adba4
commit 7708c93
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 19 deletions.
diff --git a/dir.props b/dir.props
@@ -55,15 +55,29 @@
     <ConfigurationGroup Condition="$(Configuration.EndsWith('Release'))">Release</ConfigurationGroup>
     <ConfigurationGroup Condition="'$(ConfigurationGroup)'==''">$(Configuration)</ConfigurationGroup>
 
-    <OS Condition="$(Configuration.StartsWith('Windows'))">Windows_NT</OS>
-    <OS Condition="$(Configuration.StartsWith('Unix'))">Unix</OS>
     <!-- TODO: Determine actual settings once we have Linux vs Mac specialization -->
+    <OS Condition="$(Configuration.StartsWith('FreeBSD'))">Unix</OS>
     <OS Condition="$(Configuration.StartsWith('Linux'))">Unix</OS>
     <OS Condition="$(Configuration.StartsWith('Mac'))">Unix</OS>
+    <OS Condition="$(Configuration.StartsWith('Windows'))">Windows_NT</OS>
+    <OS Condition="$(Configuration.StartsWith('Unix'))">Unix</OS>
 
     <OSGroup Condition="'$(OSGroup)'==''">$(OS)</OSGroup>
   </PropertyGroup>
-
+  <PropertyGroup Condition="'$(OS)'=='Unix'">
+    <!--
+      PDB support isn't implemented yet. https://github.com/dotnet/roslyn/issues/2449
+      Note that both DebugSymbols and DebugType need set or project references will assume they need to copy pdbs and fail.
+    -->
+    <DebugSymbols>false</DebugSymbols>
+    <DebugType>none</DebugType>
+    <!--
+      Delay signing with the ECMA key currently doesn't work.
+      https://github.com/dotnet/roslyn/issues/2444
+    -->
+    <UseECMAKey>false</UseECMAKey>
+  </PropertyGroup>
+
   <!-- Setup Default symbol and optimization for Configuration -->
   <PropertyGroup Condition="'$(ConfigurationGroup)' == 'Debug'">
     <DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>

diff --git a/src/EventTracer/EventTracer.csproj b/src/EventTracer/EventTracer.csproj
@@ -30,7 +30,7 @@
     <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.XML" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CollectTraceEventsHelper.cs" />
@@ -49,4 +49,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
+</Project>
diff --git a/src/Microsoft.DotNet.Build.Tasks/Microsoft.DotNet.Build.Tasks.csproj b/src/Microsoft.DotNet.Build.Tasks/Microsoft.DotNet.Build.Tasks.csproj
@@ -77,7 +77,7 @@
       <HintPath>..\..\packages\System.Reflection.Metadata.1.0.17-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.XML" />
+    <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
@@ -95,4 +95,4 @@
     <Copy SourceFiles="@(NativeBinariesx86)" DestinationFolder="$(OutputPath)NativeBinaries\x86" SkipUnchangedFiles="true" />
     <Copy SourceFiles="@(NativeBinariesamd64)" DestinationFolder="$(OutputPath)NativeBinaries\amd64" SkipUnchangedFiles="true" />
   </Target>
-</Project>
+</Project>
diff --git a/src/PerfEventsData/Platform.cs b/src/PerfEventsData/Platform.cs
@@ -10,6 +10,7 @@ namespace PerfEventsData
     /// </summary>
     public enum Platform
     {
+        FreeBSD,
         Linux,
         Mac,
         Windows

diff --git a/src/xunit.netcore.extensions/Discoverers/ActiveIssueDiscoverer.cs b/src/xunit.netcore.extensions/Discoverers/ActiveIssueDiscoverer.cs
@@ -27,9 +27,10 @@ public IEnumerable<KeyValuePair<string, string>> GetTraits(IAttributeInfo traitA
 
             string issue = ctorArgs.First().ToString();
             PlatformID platforms = (PlatformID)ctorArgs.Last();
-            if ((platforms.HasFlag(PlatformID.Windows) && Interop.IsWindows) ||
+            if ((platforms.HasFlag(PlatformID.FreeBSD) && Interop.IsFreeBSD) ||
                 (platforms.HasFlag(PlatformID.Linux) && Interop.IsLinux) ||
-                (platforms.HasFlag(PlatformID.OSX) && Interop.IsOSX))
+                (platforms.HasFlag(PlatformID.OSX) && Interop.IsOSX) ||
+                (platforms.HasFlag(PlatformID.Windows) && Interop.IsWindows))
             {
                 yield return new KeyValuePair<string, string>(XunitConstants.Category, XunitConstants.Failing);
                 yield return new KeyValuePair<string, string>(XunitConstants.ActiveIssue, issue);

diff --git a/src/xunit.netcore.extensions/Discoverers/PlatformSpecificDiscoverer.cs b/src/xunit.netcore.extensions/Discoverers/PlatformSpecificDiscoverer.cs
@@ -28,6 +28,8 @@ public IEnumerable<KeyValuePair<string, string>> GetTraits(IAttributeInfo traitA
                 yield return new KeyValuePair<string, string>(XunitConstants.Category, XunitConstants.NonLinuxTest);
             if (!platform.HasFlag(PlatformID.OSX))
                 yield return new KeyValuePair<string, string>(XunitConstants.Category, XunitConstants.NonOSXTest);
+            if (!platform.HasFlag(PlatformID.FreeBSD))
+                yield return new KeyValuePair<string, string>(XunitConstants.Category, XunitConstants.NonFreeBSDTest);
         }
     }
 }
diff --git a/src/xunit.netcore.extensions/Interop.PlatformDetection.cs b/src/xunit.netcore.extensions/Interop.PlatformDetection.cs
@@ -11,14 +11,15 @@ internal static partial class Interop
 {
     internal enum OperatingSystem
     {
-        Windows,
+        FreeBSD,
         Linux,
-        OSX
+        OSX,
+        Windows
     }
 
-    internal static bool IsWindows
+    internal static bool IsFreeBSD
     {
-        get { return OperatingSystem.Windows == PlatformDetection.OperatingSystem; }
+        get { return OperatingSystem.FreeBSD == PlatformDetection.OperatingSystem; }
     }
 
     internal static bool IsLinux
@@ -31,6 +32,11 @@ internal static bool IsOSX
         get { return OperatingSystem.OSX == PlatformDetection.OperatingSystem; }
     }
 
+    internal static bool IsWindows
+    {
+        get { return OperatingSystem.Windows == PlatformDetection.OperatingSystem; }
+    }
+
     internal static class PlatformDetection
     {
         internal static OperatingSystem OperatingSystem { get { return s_os.Value; } }
@@ -44,9 +50,13 @@ internal static class PlatformDetection
                     byte* buffer = stackalloc byte[8192]; // the size use with uname is platform specific; this should be large enough for any OS
                     if (uname(buffer) == 0)
                     {
-                        return Marshal.PtrToStringAnsi((IntPtr)buffer) == "Darwin" ?
-                            OperatingSystem.OSX :
-                            OperatingSystem.Linux;
+                        string os = Marshal.PtrToStringAnsi((IntPtr)buffer);
+                        if (os == "FreeBSD")
+                            return OperatingSystem.FreeBSD;
+                        else if (os == "Darwin")
+                            return OperatingSystem.OSX;
+                        else
+                            return OperatingSystem.Linux;
                     }
                 }
             }

diff --git a/src/xunit.netcore.extensions/PlatformID.cs b/src/xunit.netcore.extensions/PlatformID.cs
@@ -12,7 +12,8 @@ public enum PlatformID
         Windows = 1,
         Linux = 2,
         OSX = 4,
-        AnyUnix = Linux | OSX,
-        Any = Windows | Linux | OSX
+        FreeBSD = 8,
+        AnyUnix = FreeBSD | Linux | OSX,
+        Any = ~0
     }
 }
diff --git a/src/xunit.netcore.extensions/XunitConstants.cs b/src/xunit.netcore.extensions/XunitConstants.cs
@@ -8,9 +8,10 @@ namespace Xunit.NetCore.Extensions
 {
     internal struct XunitConstants
     {
-        public const string NonWindowsTest = "nonwindowstests";
+        public const string NonFreeBSDTest = "nonfreebsdtests";
         public const string NonLinuxTest = "nonlinuxtests";
         public const string NonOSXTest = "nonosxtests";
+        public const string NonWindowsTest = "nonwindowstests";
         public const string Category = "category";
         public const string Failing = "failing";
         public const string ActiveIssue = "activeissue";