[ios][tests] Run functional tests with Mono and Native AOT on Helix #87773
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,17 +16,22 @@ | |
| <!-- running aot-helix tests locally, so we can test with the same project file as CI --> | ||
| <_AOTBuildCommand Condition="'$(ContinuousIntegrationBuild)' != 'true'">$(_AOTBuildCommand) /p:RuntimeSrcDir=$(RepoRoot) /p:RuntimeConfig=$(Configuration)</_AOTBuildCommand> | ||
|
|
||
| <_AOTBuildCommand>$(_AOTBuildCommand) /p:XHARNESS_EXECUTION_DIR="$XHARNESS_EXECUTION_DIR" /p:RunAOTCompilation=$(RunAOTCompilation) /p:UseNativeAOTRuntime=$(UseNativeAOTRuntime) /p:TargetOS=$(TargetOS) /p:TargetArchitecture=$(TargetArchitecture) /p:MonoForceInterpreter=$(MonoForceInterpreter) /p:DevTeamProvisioning=$(DevTeamProvisioning) /p:UsePortableRuntimePack=true /p:Configuration=$(Configuration)</_AOTBuildCommand> | ||
|
There was a problem hiding this comment. Just to clarify: You removed There was a problem hiding this comment.
Correct, it should be set in the project file in the Helix payload. There was a problem hiding this comment. In that case, I assume There was a problem hiding this comment. When AOT compiling on Helix, there is a set of parameters passed when the script is invoked, such as RunAOTCompilation, UseNativeAOTRuntime, TargetOS, TargetArchitecture. These parameters are usually set through the build command. Additionally, there are parameters that configure AOT compilation like EnableLLVM, IncludesTestRunner, UseRuntimeComponents, etc. The MonoForceInterpreter parameter is passed through the build command, so it may be reasonable to keep it within the build command on the Helix as well. There was a problem hiding this comment. Thanks. We should verify what is happening during the build of functional tests, as in functional tests project files the property is treated with: So since There was a problem hiding this comment. Looking at the other functional tests project files, most of them have To conclude, I feel like this needs to be refactored (maybe not in this PR), with either removing any notion of @steveisok what do you think? There was a problem hiding this comment. Here is a related change #52606. My understanding is that it was added for local development and testing. There was a problem hiding this comment. All the relevant tests have passed. @steveisok What do you suggest doing here? There was a problem hiding this comment. @ivanpovazan Reverted the changes to be on the safe side. Please take a look again at this PR and let's try to resolve comments before the RC1 snap. There was a problem hiding this comment.
I would suggest keeping it and slowly unwinding in a follow up. |
||
| <_AOTBuildCommand>$(_AOTBuildCommand) </_AOTBuildCommand> | ||
|
|
||
| <_ResetSimulatorSwitch Condition="'$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'tvossimulator'">--reset-simulator</_ResetSimulatorSwitch> | ||
| <_SignalAppEndSwitch>--signal-app-end</_SignalAppEndSwitch> | ||
| <_AppleSignCommand Condition="'$(TargetOS)' == 'ios' or '$(TargetOS)' == 'tvos'">sign "$app"</_AppleSignCommand> | ||
|
|
||
| <IncludesTestRunner Condition="'$(IncludesTestRunner)' == ''">true</IncludesTestRunner> | ||
|
|
||
| <_AppleBuildCommand Condition="'$(IncludesTestRunner)' == 'true'">apple test</_AppleBuildCommand> | ||
| <_AppleBuildCommand Condition="'$(IncludesTestRunner)' != 'true'">apple run</_AppleBuildCommand> | ||
| <_AppleExpectedExitCode Condition="'$(ExpectedExitCode)' != ''">--expected-exit-code $(ExpectedExitCode)</_AppleExpectedExitCode> | ||
| <_AfterBuildCommands> | ||
| mv $XHARNESS_OUT/AOTBuild.binlog "$HELIX_WORKITEM_UPLOAD_ROOT" | ||
| $(_AppleSignCommand) | ||
| xharness $(_AppleBuildCommand) --app "$app" --output-directory "$output_directory" --target "$target" --timeout "$timeout" --xcode "$xcode_path" -v --launch-timeout "$launch_timeout" $(_ResetSimulatorSwitch) $(_SignalAppEndSwitch) $(_AppleExpectedExitCode) -- </_AfterBuildCommands> | ||
|
|
||
| <RunScriptCommand>$(_AOTBuildCommand) $(_AfterBuildCommands)</RunScriptCommand> | ||
| </PropertyGroup> | ||
|
|
@@ -66,11 +71,23 @@ | |
| Include="@(AppleAssembliesToBundle)" TargetDir="publish\%(AppleAssembliesToBundle.RecursiveDir)" /> | ||
| <BundleFiles Include="@(AppleNativeFilesToBundle)" TargetDir="publish\%(AppleNativeFilesToBundle.RecursiveDir)" /> | ||
| <BundleFiles Include="$(RuntimeConfigFilePath)" TargetDir="publish" /> | ||
|
|
||
| <BundleFiles Include="$(MonoProjectRoot)\msbuild\apple\data\*" TargetDir="publish" /> | ||
| <ExtraFiles Condition="'%(AppleAssembliesToBundle._IsNative)' == 'true'" | ||
| Include="@(AppleAssembliesToBundle)" TargetDir="extraFiles\%(AppleAssembliesToBundle.RecursiveDir)" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition="'$(UseNativeAOTRuntime)' == 'true'"> | ||
| <BundleFiles Include="$(MicrosoftNetCoreAppRuntimePackDir)/runtimes/$(TargetOS)-$(TargetArchitecture)/native/icudt.dat" | ||
| TargetDir="publish" /> | ||
| <BundleFiles Include="$(MicrosoftNetCoreAppRuntimePackDir)/runtimes/$(TargetOS)-$(TargetArchitecture)/native/libicudata.a" | ||
| TargetDir="publish" /> | ||
| <BundleFiles Include="$(MicrosoftNetCoreAppRuntimePackDir)/runtimes/$(TargetOS)-$(TargetArchitecture)/native/libicuuc.a" | ||
| TargetDir="publish" /> | ||
| <BundleFiles Include="$(MicrosoftNetCoreAppRuntimePackDir)/runtimes/$(TargetOS)-$(TargetArchitecture)/native/libicui18n.a" | ||
| TargetDir="publish" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition="'$(DebuggerSupport)' == 'true'"> | ||
| <!-- Add any pdb files, if available --> | ||
| <_BundlePdbFiles Include="$([System.IO.Path]::ChangeExtension('%(AppleAssembliesToBundle.Identity)', '.pdb'))" /> | ||
|
|
@@ -103,8 +120,10 @@ | |
| <_ApplePropertyNames Include="HybridGlobalization" /> | ||
| <_ApplePropertyNames Include="AssemblyName" /> | ||
| <_ApplePropertyNames Include="MonoEnableLLVM" /> | ||
| <_ApplePropertyNames Include="MainLibraryFileName" /> | ||
| <_ApplePropertyNames Include="UseConsoleUITemplate" /> | ||
| <_ApplePropertyNames Include="UseRuntimeComponents" /> | ||
| <_ApplePropertyNames Include="IncludesTestRunner" /> | ||
|
|
||
| <_ApplePropertiesToPass | ||
| Include="$(%(_ApplePropertyNames.Identity))" | ||
|
|
@@ -138,8 +157,9 @@ | |
| <WriteLinesToFile File="$(PublishDir)xunit-excludes.txt" Lines="$(XunitExcludesTxtFileContent)" Overwrite="true" /> | ||
|
|
||
| <PropertyGroup> | ||
| <IncludesTestRunner Condition="'$(IncludesTestRunner)' == ''">true</IncludesTestRunner> | ||
| <Optimized Condition="'$(Configuration)' == 'Release'">true</Optimized> | ||
| <MainLibraryFileName Condition="'$(MainLibraryFileName)' == '' and '$(IsRuntimeTests)' != 'true' and '$(IncludesTestRunner)' == 'true'">AppleTestRunner.dll</MainLibraryFileName> | ||
|
|
||
| <AppleBuildDir>$(PublishDir)</AppleBuildDir> | ||
| <AppleBundleDir>$(BundleDir)</AppleBundleDir> | ||
|
|
||
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.
We don't have the capacity to run these on every PR. Even when we kick off runtime-ioslike manually, there may be a capacity issue running both mono and nativeaot together.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.
Nevermind, my concern was all libraries tests (when we get to it) and I see it's running smoke tests only.