Skip to content

Commit 9043e31

Browse files
committed
[tests] enable adb logging for RunUITest
and run forms test in all configurations
1 parent 56c28d6 commit 9043e31

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ run-ji-tests:
154154
# (2) Add a `@(UnitTestApk)` entry to `tests/RunApkTests.targets`
155155
TEST_APK_PROJECTS = \
156156
src/Mono.Android/Test/Mono.Android-Tests.csproj \
157+
tests/Xamarin.Forms-Performance-Integration/Droid/Xamarin.Forms.Performance.Integration.Droid.csproj \
157158
tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj \
158159
tests/locales/Xamarin.Android.Locale-Tests/Xamarin.Android.Locale-Tests.csproj
159160

src/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RunUITests.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ public class RunUITests : Adb
1010
[Required]
1111
public string Activity { get; set; }
1212

13-
protected override bool LogTaskMessages {
14-
get { return false; }
15-
}
16-
1713
public override bool Execute ()
1814
{
1915
Log.LogMessage (MessageImportance.Low, $"Task {nameof (RunUITests)}");

tests/RunApkTests.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<Import Project="..\src\Mono.Android\Test\Mono.Android-Tests.projitems" />
1717
<Import Project="..\tests\CodeGen-Binding\Xamarin.Android.JcwGen-Tests\Xamarin.Android.JcwGen-Tests.projitems" Condition=" '$(Configuration)' == 'Debug' " />
1818
<Import Project="..\tests\locales\Xamarin.Android.Locale-Tests\Xamarin.Android.Locale-Tests.projitems" Condition=" '$(Configuration)' == 'Debug' " />
19-
<Import Project="..\tests\Xamarin.Forms-Performance-Integration\Droid\Xamarin.Forms.Performance.Integration.Droid.projitems" Condition=" '$(Configuration)' == 'Release' And '$(AotAssemblies)' != 'true' " />
19+
<Import Project="..\tests\Xamarin.Forms-Performance-Integration\Droid\Xamarin.Forms.Performance.Integration.Droid.projitems" />
2020
<Import Project="..\build-tools\scripts\TestApks.targets" />
2121
<PropertyGroup>
2222
<RunApkTestsDependsOn>

0 commit comments

Comments
 (0)