Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run Mono iOS sample on Helix #44462

Merged
merged 16 commits into from
Dec 11, 2020
+56 −6
Merged

Run Mono iOS sample on Helix #44462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3aab2ea
Include sample ios application to the library test build; copy Helloi…
MaximLipnin Nov 10, 2020
3efdcb3
Update Main method to return 42 in order to help xharness recognize a…
MaximLipnin Nov 16, 2020
b497f0b
Use xharness ios run to run sample app
MaximLipnin Nov 24, 2020
39feaf0
Add expected exit code and exclude test runner
MaximLipnin Nov 27, 2020
138518c
Use a separate work item for run-only app
MaximLipnin Nov 27, 2020
5c042f7
Fix tags
MaximLipnin Nov 27, 2020
3046439
Fix path
MaximLipnin Nov 28, 2020
9cae92a
Use a separate helix directory for run-only apps
MaximLipnin Nov 28, 2020
0707c31
Remove the changes in the runner template
MaximLipnin Dec 4, 2020
983f480
Revert unnecessary changes in makefile
MaximLipnin Dec 4, 2020
c6d5310
Address the feedback
MaximLipnin Dec 9, 2020
e7a32c4
Space
MaximLipnin Dec 9, 2020
3a0d05e
Bring non-zero exit code back.
MaximLipnin Dec 9, 2020
7ad7737
Remove redundant project exclusion item
MaximLipnin Dec 10, 2020
098aa87
Return non-zero exit code only for CI testing
MaximLipnin Dec 10, 2020
83e027e
Return to Publish
MaximLipnin Dec 10, 2020
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
16 changes: 15 additions & 1 deletion src/libraries/sendtohelixhelp.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
<Message Importance="High" Text="Using Timeout: $(_workItemTimeout)" />

<ItemGroup Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'">
<!-- Find all directories named *.app -->
<!-- Create work items for test apps -->
<XHarnessAppBundleToTest Include="$([System.IO.Directory]::GetDirectories('$(TestArchiveTestsRoot)', '*.app', System.IO.SearchOption.AllDirectories))">
<Targets Condition="'$(TargetArchitecture)' == 'arm'">ios-device</Targets>
<Targets Condition="'$(TargetArchitecture)' == 'arm64'">ios-device</Targets>
Expand All @@ -187,6 +187,20 @@
<TestTimeout>$(_workItemTimeout)</TestTimeout>
<LaunchTimeout>$(_workItemTimeout)</LaunchTimeout>
</XHarnessAppBundleToTest>

<!-- Create work items for run-only apps -->
<XHarnessAppBundleToTest Include="$([System.IO.Directory]::GetDirectories('$(TestArchiveRoot)runonly', '*.app', System.IO.SearchOption.AllDirectories))" >
<Targets Condition="'$(TargetArchitecture)' == 'arm'">ios-device</Targets>
<Targets Condition="'$(TargetArchitecture)' == 'arm64'">ios-device</Targets>
<Targets Condition="'$(TargetArchitecture)' == 'x64'">ios-simulator-64</Targets>
<Targets Condition="'$(TargetArchitecture)' == 'x86'">ios-simulator-32</Targets>

<LaunchTimeout>$(_workItemTimeout)</LaunchTimeout>
<!-- The sample app doesn't need test runner -->
<IncludesTestRunner>false</IncludesTestRunner>
<!-- The sample's C# Main method returns 42 so it should be considered by xharness as a success -->
<ExpectedExitCode>42</ExpectedExitCode>
</XHarnessAppBundleToTest>
</ItemGroup>

<ItemGroup Condition="'$(TargetOS)' == 'Android'">
Expand Down
3 changes: 3 additions & 0 deletions src/libraries/tests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,9 @@
Exclude="@(ProjectExclusions)"
BuildInParallel="false"
Condition="'$(TestTrimming)' == 'true'" />
<ProjectReference Include="..\mono\netcore\sample\iOS\Program.csproj"
BuildInParallel="false"
Condition="'$(ArchiveTests)' == 'true' and ('$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS')" />
</ItemGroup>

<Target Name="GenerateMergedCoverageReport"
Expand Down
9 changes: 9 additions & 0 deletions src/mono/netcore/sample/iOS/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,11 @@ private static void OnButtonClick()
ios_set_text("OnButtonClick! #" + counter++);
}

#if CI_TEST
public static async Task<int> Main(string[] args)
#else
public static async Task Main(string[] args)
#endif
{
// Register a managed callback (will be called by UIButton, see main.m)
// Also, keep the handler alive so GC won't collect it.
Expand All @@ -48,6 +52,11 @@ public static async Task Main(string[] args)
}

Console.WriteLine("Done!");
#if CI_TEST
await Task.Delay(5000);
return 42;
#else
await Task.Delay(-1);
#endif
}
}
34 changes: 29 additions & 5 deletions src/mono/netcore/sample/iOS/Program.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<RuntimeIdentifier>ios-$(TargetArchitecture)</RuntimeIdentifier>
<PublishTrimmed>true</PublishTrimmed>
<TrimMode>Link</TrimMode>
<DefineConstants Condition="'$(ArchiveTests)' == 'true'">$(DefineConstants);CI_TEST</DefineConstants>
</PropertyGroup>

<!-- Redirect 'dotnet publish' to in-tree runtime pack -->
Expand Down Expand Up @@ -82,10 +83,33 @@
<Message Importance="High" Text="Xcode: $(XcodeProjectPath)"/>
<Message Importance="High" Text="App: $(AppBundlePath)"/>

<Exec Condition="'$(IosSimulator)' != ''" Command="xcrun simctl shutdown &quot;$(IosSimulator)&quot;" ContinueOnError="WarnAndContinue" />
<Exec Condition="'$(IosSimulator)' != ''" Command="xcrun simctl boot &quot;$(IosSimulator)&quot;" />
<Exec Condition="'$(IosSimulator)' != ''" Command="open -a Simulator" />
<Exec Condition="'$(IosSimulator)' != ''" Command="xcrun simctl install &quot;$(IosSimulator)&quot; $(AppBundlePath)" />
<Exec Condition="'$(IosSimulator)' != ''" Command="xcrun simctl launch --console booted net.dot.HelloiOS" />
<Exec Condition="'$(IosSimulator)' != '' and '$(ArchiveTests)' != 'true'" Command="xcrun simctl shutdown &quot;$(IosSimulator)&quot;" ContinueOnError="WarnAndContinue" />
<Exec Condition="'$(IosSimulator)' != '' and '$(ArchiveTests)' != 'true'" Command="xcrun simctl boot &quot;$(IosSimulator)&quot;" />
<Exec Condition="'$(IosSimulator)' != '' and '$(ArchiveTests)' != 'true'" Command="open -a Simulator" />
<Exec Condition="'$(IosSimulator)' != '' and '$(ArchiveTests)' != 'true'" Command="xcrun simctl install &quot;$(IosSimulator)&quot; $(AppBundlePath)" />
<Exec Condition="'$(IosSimulator)' != '' and '$(ArchiveTests)' != 'true'" Command="xcrun simctl launch --console booted net.dot.HelloiOS" />
</Target>

<Target Name="CopySampleAppToHelixTestDir"
Condition="'$(ArchiveTests)' == 'true'"
AfterTargets="Build"
DependsOnTargets="Publish;BuildAppBundle" >
<PropertyGroup>
<!-- Helix properties -->
<!-- AnyCPU as Platform-->
<OSPlatformConfig>$(TargetOS).AnyCPU.$(Configuration)</OSPlatformConfig>
<!-- <OSPlatformConfig>$(TargetOS).$(Platform).$(Configuration)</OSPlatformConfig> -->
<HelixArchiveRoot>$(ArtifactsDir)helix/</HelixArchiveRoot>
<HelixArchiveRunOnlyRoot>$(HelixArchiveRoot)runonly/</HelixArchiveRunOnlyRoot>
<HelixArchiveRunOnlyAppsDir>$(HelixArchiveRunOnlyRoot)$(OSPlatformConfig)/</HelixArchiveRunOnlyAppsDir>
</PropertyGroup>
<ItemGroup>
<_appFiles Include="$(AppBundlePath)/../**/*" />
</ItemGroup>
<Copy SourceFiles="@(_appFiles)"
DestinationFolder="$(HelixArchiveRunOnlyAppsDir)/%(RecursiveDir)" />

<Message Importance="High" Text="AppBundlePath: $(AppBundlePath)"/>
<Message Importance="High" Text="HelixArchiveRunOnlyAppsDir: $(HelixArchiveRunOnlyAppsDir)"/>
</Target>
</Project>