From 9043e31b8997499ad67fd1e8bbada9a8ad1ee950 Mon Sep 17 00:00:00 2001
From: Radek Doulik <rodo@xamarin.com>
Date: Mon, 11 Sep 2017 14:52:25 +0200
Subject: [PATCH] [tests] enable adb logging for RunUITest

and run forms test in all configurations
---
 Makefile                                                      | 1 +
 .../Xamarin.Android.Tools.BootstrapTasks/RunUITests.cs        | 4 ----
 tests/RunApkTests.targets                                     | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 744f1b4b5ce..fcdeb142abe 100644
--- a/Makefile
+++ b/Makefile
@@ -154,6 +154,7 @@ run-ji-tests:
 # (2) Add a `@(UnitTestApk)` entry to `tests/RunApkTests.targets`
 TEST_APK_PROJECTS = \
 	src/Mono.Android/Test/Mono.Android-Tests.csproj \
+	tests/Xamarin.Forms-Performance-Integration/Droid/Xamarin.Forms.Performance.Integration.Droid.csproj \
 	tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj \
 	tests/locales/Xamarin.Android.Locale-Tests/Xamarin.Android.Locale-Tests.csproj
 
diff --git a/src/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RunUITests.cs b/src/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RunUITests.cs
index 9841efb6542..aaf959cfa97 100644
--- a/src/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RunUITests.cs
+++ b/src/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RunUITests.cs
@@ -10,10 +10,6 @@ public class RunUITests : Adb
 		[Required]
 		public                  string              Activity                    { get; set; }
 
-		protected   override    bool                LogTaskMessages {
-			get { return false; }
-		}
-
 		public override bool Execute ()
 		{
 			Log.LogMessage (MessageImportance.Low, $"Task {nameof (RunUITests)}");
diff --git a/tests/RunApkTests.targets b/tests/RunApkTests.targets
index 8a4df87c79f..653c2fe929b 100644
--- a/tests/RunApkTests.targets
+++ b/tests/RunApkTests.targets
@@ -16,7 +16,7 @@
   <Import Project="..\src\Mono.Android\Test\Mono.Android-Tests.projitems" />
   <Import Project="..\tests\CodeGen-Binding\Xamarin.Android.JcwGen-Tests\Xamarin.Android.JcwGen-Tests.projitems" Condition=" '$(Configuration)' == 'Debug' " />
   <Import Project="..\tests\locales\Xamarin.Android.Locale-Tests\Xamarin.Android.Locale-Tests.projitems"  Condition=" '$(Configuration)' == 'Debug' " />
-  <Import Project="..\tests\Xamarin.Forms-Performance-Integration\Droid\Xamarin.Forms.Performance.Integration.Droid.projitems"  Condition=" '$(Configuration)' == 'Release' And '$(AotAssemblies)' != 'true' " />
+  <Import Project="..\tests\Xamarin.Forms-Performance-Integration\Droid\Xamarin.Forms.Performance.Integration.Droid.projitems" />
   <Import Project="..\build-tools\scripts\TestApks.targets" />
   <PropertyGroup>
     <RunApkTestsDependsOn>