From 3e140890fd7ba79bd96ee42735c946b14d65d55b Mon Sep 17 00:00:00 2001
From: Sergey Andreenko <seandree@microsoft.com>
Date: Thu, 21 Feb 2019 14:38:42 -0800
Subject: [PATCH] [XUnit] Use ParallelRun==Collections on all platforms.
 (#22746)

* Use ParallelRun==Collections on all platforms.

* Fix formatting
---
 tests/tests.targets | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tests/tests.targets b/tests/tests.targets
index 273b6aa..e8d0192 100644
--- a/tests/tests.targets
+++ b/tests/tests.targets
@@ -31,11 +31,8 @@
 
     <PropertyGroup>
       <ExcludeTraits Condition="'$(ExcludeTraits)'==''">category=outerloop;category=failing</ExcludeTraits>
-      <!-- Run one assembly at a time on Linux/arm to avoid OutOfMemory (see https://github.com/dotnet/coreclr/issues/20328) -->
-      <ParallelRun Condition="'$(ParallelRun)'=='' and '$(__BuildOS)'=='Linux' and '$(__BuildArch)'=='arm'">collections</ParallelRun>
-      <!-- Run one assembly at a time on arm64 to avoid excessive parallelism leading to test timeouts (see https://github.com/dotnet/coreclr/issues/22419) -->
-      <ParallelRun Condition="'$(ParallelRun)'=='' and '$(__BuildArch)'=='arm64'">collections</ParallelRun>
-      <ParallelRun Condition="'$(ParallelRun)'==''">all</ParallelRun>
+      <!-- Run one assembly at a time to avoid excessive parallelism leading to test timeouts -->
+      <ParallelRun Condition="'$(ParallelRun)'==''">collections</ParallelRun>
     </PropertyGroup>
     <ItemGroup>
       <IncludeTraitsItems Include="$(IncludeTraits)" />
-- 
2.7.4