Disable parallel test execution on Darwin only.

aspnet · Jan 26, 2017 · b2d99b7 · b2d99b7
1 parent 4080265
commit b2d99b7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/...Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj b/...Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj
@@ -43,8 +43,18 @@
     <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.4.0-*" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(OS)' == 'Unix' ">
-    <DefineConstants>$(DefineConstants);UNIX</DefineConstants>
+  <PropertyGroup>
+    <Uname></Uname>
+  </PropertyGroup>
+
+  <Target Condition="'$(OS)' == 'Unix'" Name="RunUname" BeforeTargets="Build">
+    <Exec Command="uname" ConsoleToMSBuild="true">
+      <Output TaskParameter="ConsoleOutput" PropertyName="Uname" />
+    </Exec>
+  </Target>
+
+  <PropertyGroup Condition="'$(Uname)' == 'Darwin'">
+    <DefineConstants>$(DefineConstants);DARWIN</DefineConstants>
   </PropertyGroup>
 
 </Project>
diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Properties/AssemblyInfo.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Properties/AssemblyInfo.cs
@@ -3,6 +3,6 @@
 
 using Xunit;
 
-#if UNIX
+#if DARWIN
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
-#endif
+#endif