Skip to content

Consolidate native and managed test reporting #814

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
papeh merged 17 commits into from
Apr 13, 2026
Merged

Consolidate native and managed test reporting #814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
428e198
Add native test projects to the solution
papeh Apr 6, 2026
d3cead1
Clean up commented code in TestUtil.h
papeh Apr 6, 2026
bb946de
TEST native test reporting
papeh Apr 6, 2026
51e37f1
Run native tests every time
papeh Apr 6, 2026
c2c4010
Run native tests from the same GHA
papeh Apr 7, 2026
818c4e4
Revert "Run native tests from the same GHA"
papeh Apr 8, 2026
80cb5e9
Filter tests
papeh Apr 8, 2026
636d0e8
Include native failures in the failure summary
papeh Apr 9, 2026
8390bdd
Run all tests in one place
papeh Apr 9, 2026
663cd04
Fix path to native tests in summary message
papeh Apr 9, 2026
4f35baf
Copilot's stab at building tests
papeh Apr 10, 2026
95eecbc
my test build cleanup
papeh Apr 10, 2026
9983fec
Build and run in separate steps (again)
papeh Apr 10, 2026
1b5d9eb
polish output and artifacts
papeh Apr 10, 2026
d611f21
Revert "TEST native test reporting"
papeh Apr 10, 2026
e06913a
Drop redundant CI-native
papeh Apr 10, 2026
9fedee8
Require TestGeneric before building TestViews
papeh Apr 13, 2026
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
83 changes: 0 additions & 83 deletions .github/workflows/CI-native.yml
View file
Open in desktop

This file was deleted.

19 changes: 13 additions & 6 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,34 @@ concurrency:

jobs:
debug_build_and_test:
name: Build Debug and run managed tests
name: Build Debug and run tests
runs-on: windows-latest
steps:
- name: Checkout Files
uses: actions/checkout@v6
id: checkout

- name: Build managed (with tests)
id: managed_build
- name: Build with tests
id: build
shell: powershell
run: |
.\build.ps1 -Configuration Debug -BuildTests
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }

- name: Run managed tests
id: managed_test
- name: Run tests
id: test
shell: powershell
run: |
.\test.ps1 -Configuration Debug -NoBuild -TestFilter 'TestCategory!=LongRunning&TestCategory!=ByHand&TestCategory!=SmokeTest&TestCategory!=DesktopRequired'
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }

- name: Upload TRX test results
- name: Summarize native test results
if: ${{ always() }}
shell: powershell
run: |
.\Build\Agent\Summarize-NativeTestResults.ps1 -Configuration Debug

- name: Upload TRX test results (managed)
if: ${{ !cancelled() }}
uses: actions/upload-artifact@v7
with:
Expand All @@ -53,6 +59,7 @@ jobs:
path: |
./*.log
./Output/**/*.log
./Output/**/*.log.stderr

publish_test_results:
name: Publish Test Results
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/base-installer-cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,3 +309,4 @@ jobs:
./*.log
./*.binlog
./Output/**/*.log
./Output/**/*.log.stderr
1 change: 1 addition & 0 deletions .github/workflows/patch-installer-cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,5 +294,6 @@ jobs:
./*.log
./*.binlog
./Output/**/*.log
./Output/**/*.log.stderr
./PatchableInstaller/CreateUpdatePatch/Master/AppHarvest.wxs
./PatchableInstaller/CreateUpdatePatch/Update/AppHarvest.wxs
2 changes: 1 addition & 1 deletion Build/Src/NativeBuild/NativeBuild.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
</PackageReference>
</ItemGroup>
<!-- Override the Build target to call native build instead. Also generate Parts and Layout files. -->
<Target Name="Build" DependsOnTargets="allCppNoTest;GeneratePartsAndLayoutFiles">
<Target Name="Build" DependsOnTargets="allCpp;GeneratePartsAndLayoutFiles">
<Message Text="Native C++ components built successfully" Importance="high" />
</Target>
<!-- Ensure Clean works -->
Expand Down
13 changes: 13 additions & 0 deletions Build/mkall.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,20 @@
<!-- ======================================================================================== -->
<!-- Main Native Build Target (Called by Traversal SDK) -->
<!-- ======================================================================================== -->
<Target Name="allCpp" DependsOnTargets="allCppNoTest;allCppTest" />
<Target Name="allCppNoTest" DependsOnTargets="DebugProcs;GenericLib;FwKernel;Views" />
<Target Name="allCppTest" DependsOnTargets="allCppNoTest;TestGenericLib;TestViews" Condition="'$(BuildNativeTests)' == 'true'" />

<!-- Native test targets - build test executables via MSBuild (vcxproj) -->
<Target Name="TestGenericLib" DependsOnTargets="GenericLib" Condition="'$(OS)'=='Windows_NT' AND '$(SkipNative)'!='true'">
<MSBuild Projects="$(fwrt)\Src\Generic\Test\TestGeneric.vcxproj" Properties="Configuration=$(Configuration);Platform=$(Platform)" Targets="Build" />
<Message Text="Finished building TestGeneric." />
</Target>
<Target Name="TestViews" DependsOnTargets="Views;TestGenericLib" Condition="'$(OS)'=='Windows_NT' AND '$(SkipNative)'!='true'">
<MSBuild Projects="$(fwrt)\Src\views\Test\TestViews.vcxproj" Properties="Configuration=$(Configuration);Platform=$(Platform)" Targets="Build" />
<Message Text="Finished building TestViews." />
</Target>

<ItemGroup>
<Fragments Include="$(dir-fwdistfiles)/*.fragment.manifest" />
</ItemGroup>
Expand Down
114 changes: 65 additions & 49 deletions FieldWorks.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xWorksTests", "Src\xWorks\x
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Generic", "Src\Generic\Generic.vcxproj", "{7F6B25EE-CD22-4E4C-898D-A0F846E6E9D4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Kernel", "Src\Kernel\Kernel.vcxproj", "{6396B488-4D34-48B2-8639-EEB90707405B}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FwKernel", "Src\Kernel\Kernel.vcxproj", "{6396B488-4D34-48B2-8639-EEB90707405B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "views", "Src\views\views.vcxproj", "{C86CA2EB-81B5-4411-B5B7-E983314E02DA}"
EndProject
Expand Down Expand Up @@ -276,6 +276,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ToneParsFLExDll", "Src\Util
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DisambiguateInFLExDBTests", "Src\Utilities\pcpatrflex\DisambiguateInFLExDB\DisambiguateInFLExDBTests\DisambiguateInFLExDBTests.csproj", "{1D9F7F7D-F4DE-43DC-9E1D-9D0E512D1CB6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestViews", "Src\views\Test\TestViews.vcxproj", "{1D4CC42D-BC16-4EC3-A89B-173798828F56}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestGeneric", "Src\Generic\Test\TestGeneric.vcxproj", "{C644C392-FB14-4DF1-9989-897E182D3849}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Bounds|x64 = Bounds|x64
Expand Down Expand Up @@ -991,6 +995,54 @@ Global
{5DB1CEDA-B7AA-4594-9CE0-6D3A6F5763DF}.Debug|x64.Build.0 = Debug|x64
{5DB1CEDA-B7AA-4594-9CE0-6D3A6F5763DF}.Release|x64.ActiveCfg = Release|x64
{5DB1CEDA-B7AA-4594-9CE0-6D3A6F5763DF}.Release|x64.Build.0 = Release|x64
{996498A3-06F1-4B1B-B83F-15648DD8F514}.Bounds|x64.ActiveCfg = Debug|x64
{996498A3-06F1-4B1B-B83F-15648DD8F514}.Bounds|x64.Build.0 = Debug|x64
{996498A3-06F1-4B1B-B83F-15648DD8F514}.Debug|x64.ActiveCfg = Debug|x64
{996498A3-06F1-4B1B-B83F-15648DD8F514}.Debug|x64.Build.0 = Debug|x64
{996498A3-06F1-4B1B-B83F-15648DD8F514}.Release|x64.ActiveCfg = Release|x64
{996498A3-06F1-4B1B-B83F-15648DD8F514}.Release|x64.Build.0 = Release|x64
{ECEC3C09-019A-4B31-B72A-C4A22DE88E84}.Bounds|x64.ActiveCfg = Debug|x64
{ECEC3C09-019A-4B31-B72A-C4A22DE88E84}.Bounds|x64.Build.0 = Debug|x64
{ECEC3C09-019A-4B31-B72A-C4A22DE88E84}.Debug|x64.ActiveCfg = Debug|x64
{ECEC3C09-019A-4B31-B72A-C4A22DE88E84}.Debug|x64.Build.0 = Debug|x64
{ECEC3C09-019A-4B31-B72A-C4A22DE88E84}.Release|x64.ActiveCfg = Release|x64
{ECEC3C09-019A-4B31-B72A-C4A22DE88E84}.Release|x64.Build.0 = Release|x64
{98A04BE3-5CDA-4616-9396-E40B33CC9256}.Bounds|x64.ActiveCfg = Debug|x64
{98A04BE3-5CDA-4616-9396-E40B33CC9256}.Bounds|x64.Build.0 = Debug|x64
{98A04BE3-5CDA-4616-9396-E40B33CC9256}.Debug|x64.ActiveCfg = Debug|x64
{98A04BE3-5CDA-4616-9396-E40B33CC9256}.Debug|x64.Build.0 = Debug|x64
{98A04BE3-5CDA-4616-9396-E40B33CC9256}.Release|x64.ActiveCfg = Release|x64
{98A04BE3-5CDA-4616-9396-E40B33CC9256}.Release|x64.Build.0 = Release|x64
{B4CDC940-DDA7-4EEC-87A6-8441CF47EE7E}.Bounds|x64.ActiveCfg = Debug|x64
{B4CDC940-DDA7-4EEC-87A6-8441CF47EE7E}.Bounds|x64.Build.0 = Debug|x64
{B4CDC940-DDA7-4EEC-87A6-8441CF47EE7E}.Debug|x64.ActiveCfg = Debug|x64
{B4CDC940-DDA7-4EEC-87A6-8441CF47EE7E}.Debug|x64.Build.0 = Debug|x64
{B4CDC940-DDA7-4EEC-87A6-8441CF47EE7E}.Release|x64.ActiveCfg = Release|x64
{B4CDC940-DDA7-4EEC-87A6-8441CF47EE7E}.Release|x64.Build.0 = Release|x64
{2C57CEB5-40DE-4229-89B8-BADE30687815}.Bounds|x64.ActiveCfg = Debug|x64
{2C57CEB5-40DE-4229-89B8-BADE30687815}.Bounds|x64.Build.0 = Debug|x64
{2C57CEB5-40DE-4229-89B8-BADE30687815}.Debug|x64.ActiveCfg = Debug|x64
{2C57CEB5-40DE-4229-89B8-BADE30687815}.Debug|x64.Build.0 = Debug|x64
{2C57CEB5-40DE-4229-89B8-BADE30687815}.Release|x64.ActiveCfg = Release|x64
{2C57CEB5-40DE-4229-89B8-BADE30687815}.Release|x64.Build.0 = Release|x64
{0EDB239B-A523-4259-9123-EBA3B7E0139F}.Bounds|x64.ActiveCfg = Debug|x64
{0EDB239B-A523-4259-9123-EBA3B7E0139F}.Bounds|x64.Build.0 = Debug|x64
{0EDB239B-A523-4259-9123-EBA3B7E0139F}.Debug|x64.ActiveCfg = Debug|x64
{0EDB239B-A523-4259-9123-EBA3B7E0139F}.Debug|x64.Build.0 = Debug|x64
{0EDB239B-A523-4259-9123-EBA3B7E0139F}.Release|x64.ActiveCfg = Release|x64
{0EDB239B-A523-4259-9123-EBA3B7E0139F}.Release|x64.Build.0 = Release|x64
{AF29BF64-3F6E-4CD9-BC70-AFB68F563173}.Bounds|x64.ActiveCfg = Debug|x64
{AF29BF64-3F6E-4CD9-BC70-AFB68F563173}.Bounds|x64.Build.0 = Debug|x64
{AF29BF64-3F6E-4CD9-BC70-AFB68F563173}.Debug|x64.ActiveCfg = Debug|x64
{AF29BF64-3F6E-4CD9-BC70-AFB68F563173}.Debug|x64.Build.0 = Debug|x64
{AF29BF64-3F6E-4CD9-BC70-AFB68F563173}.Release|x64.ActiveCfg = Release|x64
{AF29BF64-3F6E-4CD9-BC70-AFB68F563173}.Release|x64.Build.0 = Release|x64
{91219E68-FF1D-4DED-BB06-3A6AF46C0419}.Bounds|x64.ActiveCfg = Debug|x64
{91219E68-FF1D-4DED-BB06-3A6AF46C0419}.Bounds|x64.Build.0 = Debug|x64
{91219E68-FF1D-4DED-BB06-3A6AF46C0419}.Debug|x64.ActiveCfg = Debug|x64
{91219E68-FF1D-4DED-BB06-3A6AF46C0419}.Debug|x64.Build.0 = Debug|x64
{91219E68-FF1D-4DED-BB06-3A6AF46C0419}.Release|x64.ActiveCfg = Release|x64
{91219E68-FF1D-4DED-BB06-3A6AF46C0419}.Release|x64.Build.0 = Release|x64
{6A3359E7-E3DA-4CF6-B6F8-C6A4E8D9800B}.Bounds|x64.ActiveCfg = Debug|x64
{6A3359E7-E3DA-4CF6-B6F8-C6A4E8D9800B}.Bounds|x64.Build.0 = Debug|x64
{6A3359E7-E3DA-4CF6-B6F8-C6A4E8D9800B}.Debug|x64.ActiveCfg = Debug|x64
Expand Down Expand Up @@ -1045,54 +1097,18 @@ Global
{1D9F7F7D-F4DE-43DC-9E1D-9D0E512D1CB6}.Debug|x64.Build.0 = Debug|x64
{1D9F7F7D-F4DE-43DC-9E1D-9D0E512D1CB6}.Release|x64.ActiveCfg = Release|x64
{1D9F7F7D-F4DE-43DC-9E1D-9D0E512D1CB6}.Release|x64.Build.0 = Release|x64
{996498A3-06F1-4B1B-B83F-15648DD8F514}.Bounds|x64.ActiveCfg = Debug|x64
{996498A3-06F1-4B1B-B83F-15648DD8F514}.Bounds|x64.Build.0 = Debug|x64
{996498A3-06F1-4B1B-B83F-15648DD8F514}.Debug|x64.ActiveCfg = Debug|x64
{996498A3-06F1-4B1B-B83F-15648DD8F514}.Debug|x64.Build.0 = Debug|x64
{996498A3-06F1-4B1B-B83F-15648DD8F514}.Release|x64.ActiveCfg = Release|x64
{996498A3-06F1-4B1B-B83F-15648DD8F514}.Release|x64.Build.0 = Release|x64
{ECEC3C09-019A-4B31-B72A-C4A22DE88E84}.Bounds|x64.ActiveCfg = Debug|x64
{ECEC3C09-019A-4B31-B72A-C4A22DE88E84}.Bounds|x64.Build.0 = Debug|x64
{ECEC3C09-019A-4B31-B72A-C4A22DE88E84}.Debug|x64.ActiveCfg = Debug|x64
{ECEC3C09-019A-4B31-B72A-C4A22DE88E84}.Debug|x64.Build.0 = Debug|x64
{ECEC3C09-019A-4B31-B72A-C4A22DE88E84}.Release|x64.ActiveCfg = Release|x64
{ECEC3C09-019A-4B31-B72A-C4A22DE88E84}.Release|x64.Build.0 = Release|x64
{98A04BE3-5CDA-4616-9396-E40B33CC9256}.Bounds|x64.ActiveCfg = Debug|x64
{98A04BE3-5CDA-4616-9396-E40B33CC9256}.Bounds|x64.Build.0 = Debug|x64
{98A04BE3-5CDA-4616-9396-E40B33CC9256}.Debug|x64.ActiveCfg = Debug|x64
{98A04BE3-5CDA-4616-9396-E40B33CC9256}.Debug|x64.Build.0 = Debug|x64
{98A04BE3-5CDA-4616-9396-E40B33CC9256}.Release|x64.ActiveCfg = Release|x64
{98A04BE3-5CDA-4616-9396-E40B33CC9256}.Release|x64.Build.0 = Release|x64
{B4CDC940-DDA7-4EEC-87A6-8441CF47EE7E}.Bounds|x64.ActiveCfg = Debug|x64
{B4CDC940-DDA7-4EEC-87A6-8441CF47EE7E}.Bounds|x64.Build.0 = Debug|x64
{B4CDC940-DDA7-4EEC-87A6-8441CF47EE7E}.Debug|x64.ActiveCfg = Debug|x64
{B4CDC940-DDA7-4EEC-87A6-8441CF47EE7E}.Debug|x64.Build.0 = Debug|x64
{B4CDC940-DDA7-4EEC-87A6-8441CF47EE7E}.Release|x64.ActiveCfg = Release|x64
{B4CDC940-DDA7-4EEC-87A6-8441CF47EE7E}.Release|x64.Build.0 = Release|x64
{2C57CEB5-40DE-4229-89B8-BADE30687815}.Bounds|x64.ActiveCfg = Debug|x64
{2C57CEB5-40DE-4229-89B8-BADE30687815}.Bounds|x64.Build.0 = Debug|x64
{2C57CEB5-40DE-4229-89B8-BADE30687815}.Debug|x64.ActiveCfg = Debug|x64
{2C57CEB5-40DE-4229-89B8-BADE30687815}.Debug|x64.Build.0 = Debug|x64
{2C57CEB5-40DE-4229-89B8-BADE30687815}.Release|x64.ActiveCfg = Release|x64
{2C57CEB5-40DE-4229-89B8-BADE30687815}.Release|x64.Build.0 = Release|x64
{0EDB239B-A523-4259-9123-EBA3B7E0139F}.Bounds|x64.ActiveCfg = Debug|x64
{0EDB239B-A523-4259-9123-EBA3B7E0139F}.Bounds|x64.Build.0 = Debug|x64
{0EDB239B-A523-4259-9123-EBA3B7E0139F}.Debug|x64.ActiveCfg = Debug|x64
{0EDB239B-A523-4259-9123-EBA3B7E0139F}.Debug|x64.Build.0 = Debug|x64
{0EDB239B-A523-4259-9123-EBA3B7E0139F}.Release|x64.ActiveCfg = Release|x64
{0EDB239B-A523-4259-9123-EBA3B7E0139F}.Release|x64.Build.0 = Release|x64
{AF29BF64-3F6E-4CD9-BC70-AFB68F563173}.Bounds|x64.ActiveCfg = Debug|x64
{AF29BF64-3F6E-4CD9-BC70-AFB68F563173}.Bounds|x64.Build.0 = Debug|x64
{AF29BF64-3F6E-4CD9-BC70-AFB68F563173}.Debug|x64.ActiveCfg = Debug|x64
{AF29BF64-3F6E-4CD9-BC70-AFB68F563173}.Debug|x64.Build.0 = Debug|x64
{AF29BF64-3F6E-4CD9-BC70-AFB68F563173}.Release|x64.ActiveCfg = Release|x64
{AF29BF64-3F6E-4CD9-BC70-AFB68F563173}.Release|x64.Build.0 = Release|x64
{91219E68-FF1D-4DED-BB06-3A6AF46C0419}.Bounds|x64.ActiveCfg = Debug|x64
{91219E68-FF1D-4DED-BB06-3A6AF46C0419}.Bounds|x64.Build.0 = Debug|x64
{91219E68-FF1D-4DED-BB06-3A6AF46C0419}.Debug|x64.ActiveCfg = Debug|x64
{91219E68-FF1D-4DED-BB06-3A6AF46C0419}.Debug|x64.Build.0 = Debug|x64
{91219E68-FF1D-4DED-BB06-3A6AF46C0419}.Release|x64.ActiveCfg = Release|x64
{91219E68-FF1D-4DED-BB06-3A6AF46C0419}.Release|x64.Build.0 = Release|x64
{1D4CC42D-BC16-4EC3-A89B-173798828F56}.Bounds|x64.ActiveCfg = Debug|x64
{1D4CC42D-BC16-4EC3-A89B-173798828F56}.Bounds|x64.Build.0 = Debug|x64
{1D4CC42D-BC16-4EC3-A89B-173798828F56}.Debug|x64.ActiveCfg = Debug|x64
{1D4CC42D-BC16-4EC3-A89B-173798828F56}.Debug|x64.Build.0 = Debug|x64
{1D4CC42D-BC16-4EC3-A89B-173798828F56}.Release|x64.ActiveCfg = Release|x64
{1D4CC42D-BC16-4EC3-A89B-173798828F56}.Release|x64.Build.0 = Release|x64
{C644C392-FB14-4DF1-9989-897E182D3849}.Bounds|x64.ActiveCfg = Debug|x64
{C644C392-FB14-4DF1-9989-897E182D3849}.Bounds|x64.Build.0 = Debug|x64
{C644C392-FB14-4DF1-9989-897E182D3849}.Debug|x64.ActiveCfg = Debug|x64
{C644C392-FB14-4DF1-9989-897E182D3849}.Debug|x64.Build.0 = Debug|x64
{C644C392-FB14-4DF1-9989-897E182D3849}.Release|x64.ActiveCfg = Release|x64
{C644C392-FB14-4DF1-9989-897E182D3849}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Loading
Loading