Skip to content

Move tests and test debuggees to repo root 'tests' directory #5469

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

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Move tests and test debuggees to repo root 'tests' directory #5469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8186c59
Move tests and test debuggees to repo root 'tests' directory
Apr 26, 2025
ad7cdcd
Remove debuggee from DbgShim.UnitTest project
Apr 28, 2025
1f9a870
Everything under the tests directory is not packable
Apr 29, 2025
93a5efa
Fix packing in official build
Apr 30, 2025
a57bf97
Fix single-file build step
Apr 30, 2025
b8315c8
Merge remote-tracking branch 'upstream/main' into organize_tests
steveisok Jul 18, 2025
cd2e7d8
Merge remote-tracking branch 'upstream/main' into organize_tests
steveisok Aug 5, 2025
aebac9c
Split out build tools and tests from running them
steveisok Aug 5, 2025
7c06f2d
Use -withtests instead because powershell doesn't seem to like prefix…
steveisok Aug 5, 2025
b118af2
WIP - DbgShim.UnitTests can run outside of the repo with a few tweaks…
steveisok Aug 25, 2025
2a8905b
Merge remote-tracking branch 'upstream/main' into organize_tests
steveisok Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
36 changes: 36 additions & 0 deletions Build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<Project Sdk="Microsoft.Build.Traversal">
<ItemGroup Condition="'$(IsTestRun)' != 'true'" Label="Diagnostic Source Projects">
<ProjectToBuild Condition="'$(DotNetBuild)' == 'true'" Include="$(RepoRoot)src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj" />
<ProjectToBuild Condition="'$(BundleTools)' == 'true'" Include="$(RepoRoot)src/singlefile-tools.proj" />

<ProjectToBuild Include="$(RepoRoot)src/Tools/dotnet-trace/dotnet-trace.csproj" />
<ProjectToBuild Include="$(RepoRoot)src/Tools/dotnet-dump/dotnet-dump.csproj" />
<ProjectToBuild Include="$(RepoRoot)src/SOS/SOS.InstallHelper/SOS.InstallHelper.csproj" />
<ProjectToBuild Include="$(RepoRoot)src/Tools/dotnet-sos/dotnet-sos.csproj" />
<ProjectToBuild Include="$(RepoRoot)src/SOS/SOS.Hosting/SOS.Hosting.csproj" />
<ProjectToBuild Include="$(RepoRoot)src/Microsoft.Diagnostics.Repl/Microsoft.Diagnostics.Repl.csproj" />
<ProjectToBuild Include="$(RepoRoot)src/Tools/dotnet-counters/dotnet-counters.csproj" />
<ProjectToBuild Include="$(RepoRoot)src/SOS/SOS.Package/SOS.Package.csproj" />
<ProjectToBuild Include="$(RepoRoot)src/Microsoft.Diagnostics.DebugServices/Microsoft.Diagnostics.DebugServices.csproj" />
<ProjectToBuild Include="$(RepoRoot)src/SOS/SOS.Package/SOS.Symbol.Package.csproj" />
<ProjectToBuild Include="$(RepoRoot)src/Tools/dotnet-gcdump/dotnet-gcdump.csproj" />
<ProjectToBuild Include="$(RepoRoot)src/Microsoft.Diagnostics.Monitoring/Microsoft.Diagnostics.Monitoring.csproj" />
<ProjectToBuild Include="$(RepoRoot)src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj" />
<ProjectToBuild Include="$(RepoRoot)src/Tools/dotnet-stack/dotnet-stack.csproj" />
<ProjectToBuild Include="$(RepoRoot)src/Microsoft.Diagnostics.DebugServices.Implementation/Microsoft.Diagnostics.DebugServices.Implementation.csproj" />
<ProjectToBuild Include="$(RepoRoot)src/SOS/SOS.Extensions/SOS.Extensions.csproj" />
<ProjectToBuild Include="$(RepoRoot)src/Microsoft.Diagnostics.ExtensionCommands/Microsoft.Diagnostics.ExtensionCommands.csproj" />
<ProjectToBuild Include="$(RepoRoot)src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj" />
<ProjectToBuild Include="$(RepoRoot)src/Microsoft.Diagnostics.WebSocketServer/Microsoft.Diagnostics.WebSocketServer.csproj" />
<ProjectToBuild Include="$(RepoRoot)src/Microsoft.FileFormats/Microsoft.FileFormats.csproj" />
<ProjectToBuild Include="$(RepoRoot)src/Microsoft.SymbolStore/Microsoft.SymbolStore.csproj" />
<ProjectToBuild Include="$(RepoRoot)src/Tools/dotnet-symbol/dotnet-symbol.csproj" />
<ProjectToBuild Include="$(RepoRoot)src/Microsoft.SymbolManifestGenerator/Microsoft.SymbolManifestGenerator.csproj" />
</ItemGroup>

<Import Condition="'$(BuildTests)' == 'true' or '$(IsTestRun)' == 'true'" Project="$(RepoRoot)Test.proj" />

<ItemGroup>
<ProjectReference Include="@(ProjectToBuild)" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,3 +199,4 @@ endif(CLR_CMAKE_HOST_UNIX)
# Native Projects
#-----------------------------------------
add_subdirectory(src)
add_subdirectory(tests)
12 changes: 12 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@
<LangVersion>Latest</LangVersion>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<_SkipUpgradeNetAnalyzersNuGetWarning>true</_SkipUpgradeNetAnalyzersNuGetWarning>
<IsShipping>false</IsShipping>
<IsPackable>false</IsPackable>
</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -67,4 +70,13 @@
<SupportedXUnitTestTargetFrameworks>net8.0</SupportedXUnitTestTargetFrameworks>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetArch)' != 'x86'">
<DotNetInstallRoot>$(RepoRoot).dotnet-test\</DotNetInstallRoot>
<RegistryRoot>HKEY_LOCAL_MACHINE\SOFTWARE</RegistryRoot>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetArch)' == 'x86'">
<DotNetInstallRoot>$(RepoRoot).dotnet-test\x86\</DotNetInstallRoot>
<RegistryRoot>HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node</RegistryRoot>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion THIRD-PARTY-NOTICES.TXT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1559,7 +1559,7 @@ SOFTWARE.

-------------------------------------------------

Source in src/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/* is largely derived from source
Source in tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/* is largely derived from source
source found at https://github.com/xunit/samples.xunit.

This set of code is covered by the following license:
Expand Down
44 changes: 44 additions & 0 deletions Test.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<Project>
<ItemGroup Label="Diagnostic Test Projects">
<ProjectToBuild Include="$(RepoRoot)tests/Microsoft.Diagnostics.TestHelpers/Microsoft.Diagnostics.TestHelpers.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/SOS.UnitTests/SOS.UnitTests.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/DotnetTrace.UnitTests/DotnetTrace.UnitTests.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/DotnetCounters.UnitTests/DotnetCounters.UnitTests.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/EventPipe.UnitTests/EventPipe.UnitTests.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Microsoft.Diagnostics.Monitoring.UnitTests/Microsoft.Diagnostics.Monitoring.UnitTests.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/CommonTestRunner/CommonTestRunner.csproj" />
<!-- Tests are broken as it hasn't been run on main in a while. Relies on older System.CommandLine API's that are no longer public -->
<!--<ProjectToBuild Include="$(RepoRoot)tests/DotnetStack.UnitTests/DotnetStack.UnitTests.csproj" />-->
<ProjectToBuild Include="$(RepoRoot)tests/TestExtension/TestExtension.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/TestHelpers/TestHelpers.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj" />
</ItemGroup>
<ItemGroup Label="Debuggee Test Projects">
<ProjectToBuild Include="$(RepoRoot)tests/Debuggees/TestDebuggee/TestDebuggee.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Debuggees/WebApp3/WebApp3.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Debuggees/SimpleThrow/SimpleThrow.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Debuggees/DivZero/DivZero.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Debuggees/GCWhere/GCWhere.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Debuggees/NestedExceptionTest/NestedExceptionTest.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Debuggees/Overflow/Overflow.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Debuggees/ReflectionTest/ReflectionTest.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserLibrary.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Debuggees/SymbolTestApp/SymbolTestDll/SymbolTestDll.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Debuggees/LineNums/LineNums.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Debuggees/GCPOH/GCPOH.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Debuggees/DotnetDumpCommands/DotnetDumpCommands.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Debuggees/DynamicMethod/DynamicMethod.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Debuggees/EventPipeTracee/EventPipeTracee.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Debuggees/ExitCodeTracee/ExitCodeTracee.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Debuggees/StackTracee/StackTracee.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Debuggees/SimpleDebuggee/SimpleDebuggee.csproj" />
<ProjectToBuild Include="$(RepoRoot)tests/Debuggees/Tracee/Tracee.csproj" />
</ItemGroup>
</Project>
Loading
Loading