[Tests] Make sure emulator is killed after tests fail (#2167)

We currently fail to kill the emulator if any of the steps executing APK tests
fail. This is because the failed task stops execution of all the other targets
defined in that file. In effect we leave running instances of the emulator on
the build bots, should such a failure happen.

This diff adds `ContinueOnError="ErrorAndContinue" to each task in the target
file so that we are sure to hit the `ReleaseAndroidTarget` target no matter what.

Author: grendello

build-tools/scripts/TestApks.targets

@@ -61,19 +61,22 @@
     <Xamarin.Android.Tools.BootstrapTasks.Adb
         EnvironmentVariables="ADB_TRACE=all"
         Condition=" '$(_ValidAdbTarget)' != 'True' "
+        ContinueOnError="ErrorAndContinue"
         Arguments="$(_EmuTarget) shell 'counter=0; while [ $counter -lt 60 ] &amp;&amp; [ &quot;`getprop sys.boot_completed`&quot; != &quot;1&quot; ]; do echo Waiting for device to fully boot; sleep 1; let &quot;counter++&quot;; done'"
         ToolExe="$(AdbToolExe)"
         ToolPath="$(AdbToolPath)"
         Timeout="120000"
     />
     <Xamarin.Android.Tools.BootstrapTasks.Adb
         Arguments="$(_AdbTarget) shell setprop debug.mono.log timing"
+        IgnoreExitCode="True"
         ToolExe="$(AdbToolExe)"
         ToolPath="$(AdbToolPath)"
         Timeout="60000"
     />
     <Xamarin.Android.Tools.BootstrapTasks.Adb
         Arguments="$(_AdbTarget) logcat -G 4M"
+        IgnoreExitCode="True"
         ToolExe="$(AdbToolExe)"
         ToolPath="$(AdbToolPath)"
         Timeout="60000"
@@ -87,35 +90,35 @@
   <Target Name="ReleaseAndroidTarget">
     <Xamarin.Android.Tools.BootstrapTasks.Adb
         Condition="'@(_FailedComponent)' != ''"
-        ContinueOnError="True"
+        ContinueOnError="ErrorAndContinue"
         Arguments="$(_EmuTarget) logcat -d"
         ToolExe="$(AdbToolExe)"
         ToolPath="$(AdbToolPath)"
         Timeout="120000"
     />
     <Xamarin.Android.Tools.BootstrapTasks.Adb
         Condition=" '$(_EmuTarget)' != '' "
-        ContinueOnError="True"
+        ContinueOnError="ErrorAndContinue"
         Arguments="$(_EmuTarget) emu kill"
         ToolExe="$(AdbToolExe)"
         ToolPath="$(AdbToolPath)"
         Timeout="60000"
     />
     <KillProcess
         Condition=" '$(_EmuTarget)' != '' "
-        ContinueOnError="True"
+        ContinueOnError="ErrorAndContinue"
         ProcessId="$(_EmuPid)"
     />
     <Xamarin.Android.Tools.BootstrapTasks.Adb
         Arguments="kill-server"
-        ContinueOnError="True"
+        ContinueOnError="ErrorAndContinue"
         ToolExe="$(AdbToolExe)"
         ToolPath="$(AdbToolPath)"
         Timeout="60000"
     />
     <Exec
         Condition=" '$(HostOS)' != 'Windows' And '$(_EmuTarget)' != '' "
-        ContinueOnError="True"
+        ContinueOnError="ErrorAndContinue"
         Command="kill -HUP $(_EmuPid)"
     />
     <Sleep
@@ -124,7 +127,7 @@
     />
     <Exec
         Condition=" '$(HostOS)' != 'Windows' And '$(_EmuTarget)' != '' "
-        ContinueOnError="True"
+        ContinueOnError="ErrorAndContinue"
         Command="kill -KILL $(_EmuPid)"
     />
   </Target>
@@ -149,6 +152,7 @@
       Condition=" '@(TestApk)' != '' ">
     <Xamarin.Android.Tools.BootstrapTasks.Adb
         Arguments="$(_AdbTarget) $(AdbOptions) install &quot;%(TestApk.Identity)&quot;"
+        ContinueOnError="ErrorAndContinue"
         ToolExe="$(AdbToolExe)"
         ToolPath="$(AdbToolPath)"
         Timeout="120000"
@@ -170,6 +174,7 @@
       Condition=" '@(TestApk)' != '' ">
     <Xamarin.Android.Tools.BootstrapTasks.Adb
         Condition=" '@(TestApkPermission)' != '' "
+        ContinueOnError="ErrorAndContinue"
         Arguments="$(_AdbTarget) $(AdbOptions) shell pm grant %(TestApkPermission.Package) android.permission.%(TestApkPermission.Identity)"
         ToolExe="$(AdbToolExe)"
         ToolPath="$(AdbToolPath)"
@@ -182,10 +187,11 @@
     </PropertyGroup>
     <RunInstrumentationTests
         Condition=" '%(TestApkInstrumentation.Identity)' != ''"
+        ContinueOnError="ErrorAndContinue"
         AdbTarget="$(_AdbTarget)"
         AdbOptions="$(AdbOptions)"
         LogLevel="Verbose"
-	PackageName="%(TestApkInstrumentation.Package)"
+        PackageName="%(TestApkInstrumentation.Package)"
         Component="%(TestApkInstrumentation.Package)/%(TestApkInstrumentation.Identity)"
         NUnit2TestResultsFile="%(TestApkInstrumentation.ResultsPath)"
         LogcatFilename="$(_LogcatFilenameBase)-%(TestApkInstrumentation.Package).txt"
@@ -198,6 +204,7 @@
     </RunInstrumentationTests>
     <RunUITests
         Condition=" '%(TestApk.Activity)' != '' "
+        ContinueOnError="ErrorAndContinue"
         AdbTarget="$(_AdbTarget)"
         AdbOptions="$(AdbOptions)"
         Activity="%(TestApk.Activity)"
@@ -208,6 +215,7 @@
     </RunUITests>
     <ProcessLogcatTiming
         Condition=" '%(TestApk.TimingDefinitionsFilename)' != '' And Exists ('$(_LogcatFilenameBase)-%(TestApk.Package).txt')"
+        ContinueOnError="ErrorAndContinue"
         InputFilename="$(_LogcatFilenameBase)-%(TestApk.Package).txt"
         ApplicationPackageName="%(TestApk.Package)"
         ResultsFilename="%(TestApk.TimingResultsFilename)"
@@ -260,14 +268,17 @@
     <Exec
         Condition=" '$(HostOS)' == 'Darwin' And '%(TestApk.ApkSizesDefinitionFilename)' != '' "
         Command="stat -f &quot;stat: %z %N&quot; &quot;%(TestApk.Identity)&quot; > &quot;$(OutputPath)%(TestApk.ApkSizesInputFilename)&quot;"
+        ContinueOnError="ErrorAndContinue"
     />
     <Exec
         Condition=" '$(HostOS)' == 'Linux'  And '%(TestApk.ApkSizesDefinitionFilename)' != '' "
         Command="stat -c &quot;stat: %s %N&quot; &quot;%(TestApk.Identity)&quot; > &quot;$(OutputPath)%(TestApk.ApkSizesInputFilename)&quot;"
+        ContinueOnError="ErrorAndContinue"
     />
     <Exec
         Condition=" '%(TestApk.ApkSizesDefinitionFilename)' != '' "
-        Command="unzip -l &quot;%(TestApk.Identity)&quot; >> &quot;$(OutputPath)%(TestApk.ApkSizesInputFilename)&quot;" />
+        Command="unzip -l &quot;%(TestApk.Identity)&quot; >> &quot;$(OutputPath)%(TestApk.ApkSizesInputFilename)&quot;"
+        ContinueOnError="ErrorAndContinue" />
     <ProcessPlotInput
         Condition=" '%(TestApk.ApkSizesDefinitionFilename)' != '' "
         InputFilename="$(OutputPath)%(TestApk.ApkSizesInputFilename)"
@@ -276,6 +287,7 @@
         DefinitionsFilename="%(TestApk.ApkSizesDefinitionFilename)"
         AddResults="True"
         LabelSuffix="-$(Configuration)$(TestsAotName)"
+        ContinueOnError="ErrorAndContinue"
     />
   </Target>
 </Project>