[Mono.Android-Tests] Run Java.Interop tests as well. #3393
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,14 @@ | |
| <_BuildStatusFiles Include="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\*.projitems" /> | ||
| <_BuildStatusFiles Include="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\*.cmake" /> | ||
| <_BuildStatusFiles Include="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\*.targets" /> | ||
| <_BuildStatusFiles Include="$(XamarinAndroidSourcePath)bin\Test$(Configuration)\XABuildConfig.cs" Condition="Exists('$(XamarinAndroidSourcePath)bin\Test$(Configuration)\XABuildConfig.cs')" /> | ||
| <_BuildStatusFiles Include="$(XamarinAndroidSourcePath)bin\Test$(Configuration)\*.binlog" /> | ||
| <_BuildStatusFiles Include="$(XamarinAndroidSourcePath)bin\Test$(Configuration)\prepare*.log" /> | ||
| <_BuildStatusFiles Include="$(XamarinAndroidSourcePath)bin\Test$(Configuration)\*.mk" /> | ||
| <_BuildStatusFiles Include="$(XamarinAndroidSourcePath)bin\Test$(Configuration)\*.projitems" /> | ||
| <_BuildStatusFiles Include="$(XamarinAndroidSourcePath)bin\Test$(Configuration)\*.cmake" /> | ||
| <_BuildStatusFiles Include="$(XamarinAndroidSourcePath)bin\Test$(Configuration)\*.targets" /> | ||
| <_BuildStatusFiles Include="$(XamarinAndroidSourcePath)external\Java.Interop\bin\Build$(Configuration)\*.props" /> | ||
|
Member
There was a problem hiding this comment. We might not need the .targets, .projitems, or .props, since binlog files contain all the MSBuild sources at build time. You can view them easily on Windows with http://msbuildlog.com, and maybe unzip can get access to them on Mac? |
||
| <_BuildStatusFiles Include="$(XamarinAndroidSourcePath)**\ThirdPartyNotices.txt" /> | ||
| <_BuildStatusFiles Include="$(XamarinAndroidSourcePath)**\config.log" /> | ||
| <_BuildStatusFiles Include="$(XamarinAndroidSourcePath)**\config.status" /> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| using System; | ||
|
|
||
| namespace Xamarin.Android.Prepare | ||
| { | ||
| [Scenario (isDefault: false)] | ||
| partial class Scenario_PrepareExternal : ScenarioNoStandardEndSteps | ||
| { | ||
| public Scenario_PrepareExternal () | ||
| : base ("PrepareExternal", "Prepare external submodules", Context.Instance) | ||
| {} | ||
|
|
||
| protected override void AddSteps (Context context) | ||
| { | ||
| Steps.Add (new Step_PrepareExternal ()); | ||
| Steps.Add (new Step_PrepareExternalJavaInterop ()); | ||
| } | ||
jonpryor marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| using System.Collections.Generic; | ||
| using System.IO; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace Xamarin.Android.Prepare | ||
| { | ||
| partial class Step_PrepareExternalJavaInterop | ||
| { | ||
| async Task<bool> ExecuteOSSpecific (Context context) | ||
| { | ||
| string javaInteropDir = context.Properties.GetRequiredValue (KnownProperties.JavaInteropFullPath); | ||
| Log.StatusLine (); | ||
| var make = new MakeRunner (context) { | ||
| NoParallelJobs = true | ||
| }; | ||
| var result = await make.Run ( | ||
| logTag: "java-interop-prepare", | ||
| workingDirectory: javaInteropDir, | ||
| arguments: new List <string> { | ||
| "prepare", | ||
| $"CONFIGURATION={context.Configuration}", | ||
| $"JAVA_HOME={context.OS.JavaHome}", | ||
| $"JI_MAX_JDK={Configurables.Defaults.MaxJDKVersion}", | ||
| } | ||
| ); | ||
| if (!result) | ||
| return false; | ||
|
|
||
| Log.StatusLine (); | ||
| result = await make.Run ( | ||
| logTag: "java-interop-props", | ||
| workingDirectory: javaInteropDir, | ||
| arguments: new List <string> { | ||
| $"bin/Build{context.Configuration}/JdkInfo.props", | ||
| $"CONFIGURATION={context.Configuration}", | ||
| $"JI_MAX_JDK={Configurables.Defaults.MaxJDKVersion}", | ||
| } | ||
| ); | ||
| return result; | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| using System.IO; | ||
| using System.Collections.Generic; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace Xamarin.Android.Prepare | ||
| { | ||
| partial class Step_PrepareExternalJavaInterop | ||
| { | ||
| async Task<bool> ExecuteOSSpecific (Context context) | ||
| { | ||
| return true; | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| using System.Collections.Generic; | ||
| using System.IO; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace Xamarin.Android.Prepare | ||
| { | ||
| partial class Step_PrepareExternalJavaInterop : Step | ||
| { | ||
| public Step_PrepareExternalJavaInterop () | ||
| : base ("Preparing external/Java.Interop") | ||
| {} | ||
|
|
||
| protected override async Task<bool> Execute (Context context) | ||
| { | ||
| return await ExecuteOSSpecific (context); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Files which are using
bin\Test$(Configuration)\as an output dir should perhaps be included in the_TestResultFilesItemGroup defined below instead.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps? Except these are part of the build-time environment, not the "test result" environment. Very arguable.