Revert "[tests] Enable adb logging for RunUITest (#838)"

This reverts commit ae2791a. The PR was intended just for testing on Jenkins PR builder. Was labeled `do-not-merge`. I should probably state it in the commit message as well next time, to be better visible.
dotnet · Sep 12, 2017 · a6e8555 · a6e8555
1 parent f9a31c1
commit a6e8555
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -154,7 +154,6 @@ 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
@@ -10,6 +10,10 @@ 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
@@ -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" />
+  <Import Project="..\tests\Xamarin.Forms-Performance-Integration\Droid\Xamarin.Forms.Performance.Integration.Droid.projitems"  Condition=" '$(Configuration)' == 'Release' And '$(AotAssemblies)' != 'true' " />
   <Import Project="..\build-tools\scripts\TestApks.targets" />
   <PropertyGroup>
     <RunApkTestsDependsOn>