Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
2 changes: 1 addition & 1 deletion eng/testsos.cmd
Original file line number Diff line number Diff line change
@@ -1 +1 @@
%~dp0..\.dotnet\dotnet.exe test --no-build --logger "console;verbosity=detailed" %~dp0..\src\SOS\SOS.UnitTests\SOS.UnitTests.csproj
%~dp0..\.dotnet\dotnet.exe test --no-build --logger "console;verbosity=detailed" %~dp0..\src\tests\SOS.UnitTests\SOS.UnitTests.csproj
2 changes: 1 addition & 1 deletion eng/testsos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ done

scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
export LLDB_PATH=/usr/bin/lldb
$scriptroot/../.dotnet/dotnet test --no-build --logger "console;verbosity=detailed" $scriptroot/../src/SOS/SOS.UnitTests/SOS.UnitTests.csproj
$scriptroot/../.dotnet/dotnet test --no-build --logger "console;verbosity=detailed" $scriptroot/../src/tests/SOS.UnitTests/SOS.UnitTests.csproj
2 changes: 1 addition & 1 deletion eng/testsoscdac.cmd
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
set SOS_TEST_CDAC=true
%~dp0..\.dotnet\dotnet.exe test --no-build --logger "console;verbosity=detailed" %~dp0..\src\SOS\SOS.UnitTests\SOS.UnitTests.csproj --filter "Category=CDACCompatible"
%~dp0..\.dotnet\dotnet.exe test --no-build --logger "console;verbosity=detailed" %~dp0..\src\tests\SOS.UnitTests\SOS.UnitTests.csproj --filter "Category=CDACCompatible"
2 changes: 1 addition & 1 deletion eng/testsoscdac.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ done
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
export LLDB_PATH=/usr/bin/lldb
export SOS_TEST_CDAC=true
$scriptroot/../.dotnet/dotnet test --no-build --logger "console;verbosity=detailed" $scriptroot/../src/SOS/SOS.UnitTests/SOS.UnitTests.csproj --filter "Category=CDACCompatible"
$scriptroot/../.dotnet/dotnet test --no-build --logger "console;verbosity=detailed" $scriptroot/../src/tests/SOS.UnitTests/SOS.UnitTests.csproj --filter "Category=CDACCompatible"
1 change: 0 additions & 1 deletion src/dirs.proj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

<!-- SOS -->
<ProjectReference Include="SOS/*/*.csproj" />
<ProjectReference Include="SOS/SOS.UnitTests/Debuggees/**/*.csproj" />

<ProjectReference Include="Microsoft.Diagnostics.DebugServices/Microsoft.Diagnostics.DebugServices.csproj" />
<ProjectReference Include="Microsoft.Diagnostics.DebugServices.Implementation/Microsoft.Diagnostics.DebugServices.Implementation.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<TestSingleFile>true</TestSingleFile>
<TestSingleFile Condition="'$(PrivateBuildTesting)' == 'true'">false</TestSingleFile>

<DebuggeeSourceRoot>$(RepoRootDir)/src/SOS/SOS.UnitTests/Debuggees</DebuggeeSourceRoot>
<DebuggeeSourceRoot>$(RepoRootDir)/src/tests/SOS.UnitTests/Debuggees</DebuggeeSourceRoot>
<DebuggeeMsbuildAuxRoot>$(RepoRootDir)/eng/AuxMsbuildFiles</DebuggeeMsbuildAuxRoot>
<DebuggeeBuildProcess>sdk.prebuilt</DebuggeeBuildProcess>
<DebuggeeBuildRoot>$(ArtifactsDir)</DebuggeeBuildRoot>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<DesktopFrameworkPath Condition="$(TargetArchitecture) == x64">$(WinDir)\Microsoft.Net\Framework64\v4.0.30319\</DesktopFrameworkPath>
<DesktopFrameworkPath Condition="$(TargetArchitecture) != x64">$(WinDir)\Microsoft.Net\Framework\v4.0.30319\</DesktopFrameworkPath>

<DebuggeeSourceRoot>$(RepoRootDir)\src\SOS\SOS.UnitTests\Debuggees</DebuggeeSourceRoot>
<DebuggeeSourceRoot>$(RepoRootDir)\src\tests\SOS.UnitTests\Debuggees</DebuggeeSourceRoot>
<DebuggeeMsbuildAuxRoot>$(RepoRootDir)\eng\AuxMsbuildFiles</DebuggeeMsbuildAuxRoot>
<DebuggeeBuildProcess>sdk.prebuilt</DebuggeeBuildProcess>
<DebuggeeBuildRoot>$(ArtifactsDir)</DebuggeeBuildRoot>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\Microsoft.Diagnostics.TestHelpers\Microsoft.Diagnostics.TestHelpers.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\tests\TestExtension\TestExtension.csproj" />
<ProjectReference Include="$(SrcDir)/Microsoft.Diagnostics.TestHelpers/Microsoft.Diagnostics.TestHelpers.csproj" />
<ProjectReference Include="$(TestDir)/TestExtension/TestExtension.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/tests/dirs.proj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.Build.Traversal">
<ItemGroup>
<!-- Debuggees -->
<ProjectReference Include="*/Debuggees/*/*.csproj" />
<ProjectReference Include="*/Debuggees/**/*.csproj" />

<!-- Tests and Helpers -->
<ProjectReference Include="*/*.csproj" />
Expand Down
Loading