From 9f5c703f7f9f94ffc6b4e7f99e7c6e2e0a535cf7 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Wed, 14 Mar 2018 21:57:50 +0100
Subject: [PATCH 1/3] Ignore the `nonuapaottests` category of XUnit tests

Fixes: https://github.com/xamarin/xamarin-android/issues/1400
---
 .../Xamarin.Android.Bcl-Tests/XUnitInstrumentation.cs        | 5 ++++-
 .../Xamarin.Android.Bcl-Tests.csproj                         | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/XUnitInstrumentation.cs b/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/XUnitInstrumentation.cs
index 4d24bd14987..a417b080092 100644
--- a/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/XUnitInstrumentation.cs
+++ b/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/XUnitInstrumentation.cs
@@ -65,7 +65,10 @@ protected override void ConfigureFilters (XUnitTestRunner runner)
 				// From some failing corefx tests
 				new XUnitFilter ("category", "nonlinuxtests", true),
 				new XUnitFilter ("category", "nonmonotests", true),
-				new XUnitFilter ("category", "nonnetfxtests", true)
+				new XUnitFilter ("category", "nonnetfxtests", true),
+#if AOT
+				new XUnitFilter ("category", "nonuapaottests", true),
+#endif
 			};
 
 			if (excludedTestNames != null && excludedTestNames.Count > 0) {
diff --git a/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.csproj b/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.csproj
index 684d972338d..87ed50097f0 100644
--- a/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.csproj
+++ b/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.csproj
@@ -44,6 +44,9 @@
     <AndroidManagedSymbols>true</AndroidManagedSymbols>
     <MandroidI18n>cjk;mideast;other;rare;west</MandroidI18n>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(AotAssemblies)' == 'true' ">
+    <DefineConstants>$(DefineConstants);AOT</DefineConstants>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />

From 7737f71090c198751960164309105982e90f3c16 Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Wed, 2 May 2018 16:13:21 -0400
Subject: [PATCH 2/3] Ignore `nonuapaottests` on !DEBUG

---
 .../Xamarin.Android.Bcl-Tests/XUnitInstrumentation.cs         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/XUnitInstrumentation.cs b/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/XUnitInstrumentation.cs
index a417b080092..65128bd3765 100644
--- a/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/XUnitInstrumentation.cs
+++ b/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/XUnitInstrumentation.cs
@@ -66,9 +66,9 @@ protected override void ConfigureFilters (XUnitTestRunner runner)
 				new XUnitFilter ("category", "nonlinuxtests", true),
 				new XUnitFilter ("category", "nonmonotests", true),
 				new XUnitFilter ("category", "nonnetfxtests", true),
-#if AOT
+#if !DEBUG // aka "Release"
 				new XUnitFilter ("category", "nonuapaottests", true),
-#endif
+#endif  // !DEBUG
 			};
 
 			if (excludedTestNames != null && excludedTestNames.Count > 0) {

From ae8250dafd08eeab2795dcc59b90c02f3f35231c Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Wed, 2 May 2018 16:13:43 -0400
Subject: [PATCH 3/3] Remove `$(AotAssemblies)` check.

---
 .../Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.csproj | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.csproj b/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.csproj
index 87ed50097f0..684d972338d 100644
--- a/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.csproj
+++ b/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.csproj
@@ -44,9 +44,6 @@
     <AndroidManagedSymbols>true</AndroidManagedSymbols>
     <MandroidI18n>cjk;mideast;other;rare;west</MandroidI18n>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(AotAssemblies)' == 'true' ">
-    <DefineConstants>$(DefineConstants);AOT</DefineConstants>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />