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

Remove the logic duplication for iOS case #46189

Merged
merged 4 commits into from
Dec 18, 2020
Merged

Remove the logic duplication for iOS case #46189

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b62b33a
Remove the logic duplication for iOS case
MaximLipnin Dec 17, 2020
a4a2f18
Parenthesis
MaximLipnin Dec 17, 2020
99137e8
Try the approach with ItemDefinitionGroup
MaximLipnin Dec 18, 2020
4f1e08d
ItemDefinitionGroup can't be inside target
MaximLipnin Dec 18, 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
28 changes: 12 additions & 16 deletions src/libraries/sendtohelixhelp.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,17 @@
<HelixProperties Condition="'$(Scenario)' != ''" Include="scenario" Value="$(Scenario)" />
</ItemGroup>

<ItemDefinitionGroup Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'">
<XHarnessAppBundleToTest>
<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>
<TestTimeout>$(_workItemTimeout)</TestTimeout>
<LaunchTimeout>$(_workItemTimeout)</LaunchTimeout>
</XHarnessAppBundleToTest>
</ItemDefinitionGroup>

<!--
Create all the Helix data to start a set of jobs. Create a set of work items, one for each libraries
test assembly. All will have the same command line. Note that this target is listed in the
Expand All @@ -178,24 +189,9 @@

<ItemGroup Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'">
<!-- 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>
<Targets Condition="'$(TargetArchitecture)' == 'x64'">ios-simulator-64</Targets>
<Targets Condition="'$(TargetArchitecture)' == 'x86'">ios-simulator-32</Targets>

<TestTimeout>$(_workItemTimeout)</TestTimeout>
<LaunchTimeout>$(_workItemTimeout)</LaunchTimeout>
</XHarnessAppBundleToTest>

<XHarnessAppBundleToTest Include="$([System.IO.Directory]::GetDirectories('$(TestArchiveTestsRoot)', '*.app', System.IO.SearchOption.AllDirectories))" />
<!-- 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 -->
Expand Down