Skip to content

Commit

Permalink
Try to fix _MergedWrapperMarker (dotnet#85476)
Browse files Browse the repository at this point in the history
Don't include markers without execution scripts
  • Loading branch information
BruceForstall committed Apr 27, 2023
1 parent 94f2b65 commit 0b9ff15
Showing 1 changed file with 15 additions and 5 deletions.
20 changes: 15 additions & 5 deletions src/tests/Common/helixpublishwitharcade.proj
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
============================================
<PropertyGroup>
<BUILD_SOURCESDIRECTORY>c:\gh\runtime</BUILD_SOURCESDIRECTORY>
<CorrelationPayloadDirectory>c:\bugs\spmicollect3\payload\correlation</CorrelationPayloadDirectory>
<WorkItemDirectory>c:\bugs\spmicollect3\payload\workitem</WorkItemDirectory>
<BUILD_SOURCESDIRECTORY>/home/brucefo/gh/runtime</BUILD_SOURCESDIRECTORY>
<CorrelationPayloadDirectory>/home/brucefo/test/correlation</CorrelationPayloadDirectory>
<WorkItemDirectory>/home/brucefo/test/workitem</WorkItemDirectory>
<_Scenarios>normal</_Scenarios>
<_Creator></_Creator>
<_HelixAccessToken></_HelixAccessToken>
<_HelixBuild></_HelixBuild>
<_HelixSource></_HelixSource>
<_HelixTargetQueues>Windows.10.Amd64.Open</_HelixTargetQueues>
<_HelixTargetQueues>Ubuntu.1804.Amd64.Open</_HelixTargetQueues>
<_HelixType>test/stuff</_HelixType>
<_PublishTestResults>false</_PublishTestResults>
<_RunCrossGen>false</_RunCrossGen>
Expand All @@ -47,7 +47,7 @@
<BundledNETCoreAppPackageVersion>BundledNETCoreAppPackageVersion</BundledNETCoreAppPackageVersion>
<HelixRuntimeRid></HelixRuntimeRid>
<_PALTestsDir></_PALTestsDir>
<_SuperPmiCollect>true</_SuperPmiCollect>
<_SuperPmiCollect>false</_SuperPmiCollect>
</PropertyGroup>
<Target Name="printItems">
<Message Text="@(HelixWorkItem -> 'name: %(HelixWorkItem.Identity)
Expand Down Expand Up @@ -358,7 +358,17 @@
<ItemGroup>
<!-- Exclude WASM support files. They can interfere with our discovery process and create extra work items that don't work. -->
<_MergedWrapperMarker Include="$(TestBinDir)**\*.MergedTestAssembly" Exclude="$(TestBinDir)**\supportFiles\*.MergedTestAssembly" />

<_MergedWrapperMarker Update="@(_MergedWrapperMarker)">
<TestExecutionScriptPath>$([System.IO.Path]::ChangeExtension('%(Identity)', '.$(TestScriptExtension)'))</TestExecutionScriptPath>
</_MergedWrapperMarker>

<!-- Exclude merged test wrappers without the test execution script for this target (skipped due to CLRTestTargetUnsupported et al) -->
<_MergedWrapperMarker Remove="@(_MergedWrapperMarker)" Condition="!Exists('%(TestExecutionScriptPath)')" />
</ItemGroup>

<Message Text="_MergedWrapperMarkers:"/>
<Message Text="%(_MergedWrapperMarker.Identity)"/>
</Target>

<Target Name="PrepareMergedTestPayloadDirectoryForDesktop"
Expand Down

0 comments on commit 0b9ff15

Please sign in to comment.