Skip to content

Commit e7a0624

Browse files
committed
Probably fix two tests
1 parent 648b487 commit e7a0624

File tree

1 file changed

+22
-1
lines changed

1 file changed

+22
-1
lines changed

tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1491,7 +1491,23 @@ public MyTextObjectFont (PdfPageTextObjectFont font) : base (font)
14911491

14921492
var builder = CreateApkBuilder ();
14931493
Assert.IsTrue (builder.Build (proj), "`dotnet build` should succeed");
1494-
builder.AssertHasNoWarnings ();
1494+
if (runtime == AndroidRuntime.MonoVM) {
1495+
builder.AssertHasNoWarnings ();
1496+
} else {
1497+
// CoreCLR generates:
1498+
// warning XA1040: The CoreCLR runtime on Android is an experimental feature and not yet suitable for production use.
1499+
//
1500+
// NativeAOT generates (twice, once per arch):
1501+
// warning IL3053: Assembly 'Mono.Android' produced AOT analysis warnings.
1502+
//
1503+
int expected = runtime switch {
1504+
AndroidRuntime.CoreCLR => 1,
1505+
AndroidRuntime.NativeAOT => 2,
1506+
_ => throw new NotSupportedException ($"Unsupported runtime '{runtime}'")
1507+
};
1508+
builder.AssertHasSomeWarnings (expected);
1509+
1510+
}
14951511
RunProjectAndAssert (proj, builder);
14961512

14971513
WaitForPermissionActivity (Path.Combine (Root, builder.ProjectDirectory, "permission-logcat.log"));
@@ -1612,6 +1628,11 @@ public void FastDeployEnvironmentFiles ([Values] bool isRelease, [Values] bool e
16121628
return;
16131629
}
16141630

1631+
// FastDeploy is used only in Debug builds, NativeAOT is used only in Release builds
1632+
if (runtime == AndroidRuntime.NativeAOT) {
1633+
Assert.Ignore ("NativeAOT doesn't support FastDeploy");
1634+
}
1635+
16151636
if (!isRelease && !embedAssembliesIntoApk) {
16161637
Assert.Ignore ("Not a FastDev configuration");
16171638
}

0 commit comments

Comments
 (0)