Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,11 @@ public class BaseTest
/// Checks if a commercial .NET for Android is available
/// * Defaults to Assert.Ignore ()
/// </summary>
public void AssertCommercialBuild (bool fail = false)
public void AssertCommercialBuild ()
{
if (!TestEnvironment.CommercialBuildAvailable) {
var message = $"'{TestName}' requires a commercial build of .NET for Android.";
var runningOnCI = false;
bool.TryParse (Environment.GetEnvironmentVariable ("RunningOnCI"), out runningOnCI);
if (fail || runningOnCI) {
Assert.Fail (message);
} else {
Assert.Ignore (message);
}
Assert.Inconclusive (message);
}
}

Expand Down
4 changes: 4 additions & 0 deletions tests/MSBuildDeviceIntegration/Tests/PerformanceTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ XamarinAndroidApplicationProject CreateApplicationProject ()
[Retry (Retry)]
public void Build_From_Clean_DontIncludeRestore ()
{
AssertCommercialBuild (); // If <BuildApk/> runs, this test will fail without Fast Deployment

var proj = CreateApplicationProject ();
using (var builder = CreateBuilderWithoutLogFile ()) {
builder.AutomaticNuGetRestore = false;
Expand Down Expand Up @@ -257,6 +259,8 @@ public void Build_AndroidAsset_Change ()
[Retry (Retry)]
public void Build_JLO_Change ()
{
AssertCommercialBuild (); // If <BuildApk/> runs, this test will fail without Fast Deployment

var className = "Foo";
var proj = CreateApplicationProject ();
proj.Sources.Add (new BuildItem.Source ("Foo.cs") {
Expand Down
Loading