Skip to content

Fix MSBuild encoding and capture archive exit code in cDAC Helix commands #126335

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

Merged
max-charlamb merged 1 commit into from
Apr 1, 2026
Merged

Fix MSBuild encoding and capture archive exit code in cDAC Helix commands #126335

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 23 additions & 4 deletions src/native/managed/cdac/tests/DumpTests/cdac-dump-helix.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,25 +176,44 @@
<_HelixCommandLines Condition="'$(TargetOS)' == 'windows'"
Include="set test_exit_code=%25ERRORLEVEL%25" />
<_HelixCommandLines Condition="'$(TargetOS)' != 'windows'"
Include="test_exit_code=$?" />
Include="test_exit_code=%24%3F" />
</ItemGroup>

<!-- Archive dumps for download regardless of test outcome. -->
<ItemGroup>
<_HelixCommandLines Condition="'$(TargetOS)' == 'windows'"
Include="tar -czf %25HELIX_WORKITEM_UPLOAD_ROOT%25\dumps.tar.gz -C %25HELIX_WORKITEM_PAYLOAD%25\dumps ." />
<_HelixCommandLines Condition="'$(TargetOS)' == 'windows'"
Include="set archive_exit_code=%25ERRORLEVEL%25" />
<_HelixCommandLines Condition="'$(TargetOS)' != 'windows'"
Include="tar -czf $HELIX_WORKITEM_UPLOAD_ROOT/dumps.tar.gz -C $HELIX_WORKITEM_PAYLOAD/dumps ." />
<_HelixCommandLines Condition="'$(TargetOS)' != 'windows'"
Include="archive_exit_code=%24%3F" />
</ItemGroup>

<!-- Propagate test exit code without directly exiting the parent Helix work item shell (see GH issue #126196). -->
<!--
Propagate result exit code without directly exiting the parent Helix work item shell
(see GH issue #126196). Test failure takes priority; otherwise report archive failure.
-->
<ItemGroup Condition="'$(DumpOnly)' != 'true'">
<_HelixCommandLines Condition="'$(TargetOS)' == 'windows'"
Include="%25ComSpec%25 /C exit %25test_exit_code%25" />
Include="set result_exit_code=0" />
<_HelixCommandLines Condition="'$(TargetOS)' == 'windows'"
Include="if %25archive_exit_code%25 NEQ 0 set result_exit_code=%25archive_exit_code%25" />
<_HelixCommandLines Condition="'$(TargetOS)' == 'windows'"
Include="if %25test_exit_code%25 NEQ 0 set result_exit_code=%25test_exit_code%25" />
<_HelixCommandLines Condition="'$(TargetOS)' == 'windows'"
Include="%25ComSpec%25 /C exit %25result_exit_code%25" />
<_HelixCommandLines Condition="'$(TargetOS)' != 'windows'"
Include="result_exit_code=0" />
<_HelixCommandLines Condition="'$(TargetOS)' != 'windows'"
Include="if [ %24archive_exit_code -ne 0 ]%3B then result_exit_code=%24archive_exit_code%3B fi" />
<_HelixCommandLines Condition="'$(TargetOS)' != 'windows'"
Include="if [ %24test_exit_code -ne 0 ]%3B then result_exit_code=%24test_exit_code%3B fi" />
<_HelixCommandLines Condition="'$(TargetOS)' != 'windows'"
Include="set_return() { return $1%3B }" />
<_HelixCommandLines Condition="'$(TargetOS)' != 'windows'"
Include="set_return $test_exit_code" />
Include="set_return %24result_exit_code" />
</ItemGroup>

<WriteLinesToFile File="$(_HelixCommandFile)" Lines="@(_HelixCommandLines)" Overwrite="true" />
Expand Down
Loading