Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grendello merged 1 commit into from
Sep 11, 2018
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions build-tools/scripts/TestApks.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -124,7 +127,7 @@
/>
<Exec
Condition=" '$(HostOS)' != 'Windows' And '$(_EmuTarget)' != '' "
ContinueOnError="True"
ContinueOnError="ErrorAndContinue"
Command="kill -KILL $(_EmuPid)"
/>
</Target>
Expand All @@ -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"
Expand All @@ -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)"
Expand All @@ -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"
Expand All @@ -198,6 +204,7 @@
</RunInstrumentationTests>
<RunUITests
Condition=" '%(TestApk.Activity)' != '' "
ContinueOnError="ErrorAndContinue"
AdbTarget="$(_AdbTarget)"
AdbOptions="$(AdbOptions)"
Activity="%(TestApk.Activity)"
Expand All @@ -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)"
Expand Down Expand Up @@ -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)"
Expand All @@ -276,6 +287,7 @@
DefinitionsFilename="%(TestApk.ApkSizesDefinitionFilename)"
AddResults="True"
LabelSuffix="-$(Configuration)$(TestsAotName)"
ContinueOnError="ErrorAndContinue"
/>
</Target>
</Project>