Skip to content

Run all SOS checks in cDAC verify mode #5972

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
hoyosjs merged 1 commit into from
Aug 21, 2026
Merged

Run all SOS checks in cDAC verify mode #5972

Show file tree
Hide file tree
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
2 changes: 0 additions & 2 deletions eng/testsoscdac.cmd
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions eng/testsoscdac.sh
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions src/tests/SOS.UnitTests/SOSRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1636,10 +1636,6 @@ private HashSet<string> GetEnabledDefines()
{
defines.Add("HOST_RUNTIME_NONE");
}
if (_config.DacMode == DacMode.CDacVerify)
{
defines.Add("CDAC_NO_FALLBACK_TESTING");
}
return defines;
}

Expand Down
2 changes: 0 additions & 2 deletions src/tests/SOS.UnitTests/Scripts/ClrStackWithNumberOfFrames.script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ VERIFY:(?:[^\r\n]*\r?\n){6}[ \t]*\r?\n
!VERIFY:(?:[^\r\n]*\r?\n){8}[ \t]*\r?\n

# Verify that ClrStack with number of frames works using ICorDebug
!IFDEF:CDAC_NO_FALLBACK_TESTING
SOSCOMMAND:ClrStack -i -c 1
VERIFY:(?:[^\r\n]*\r?\n){8}[ \t]*\r?\n
!VERIFY:(?:[^\r\n]*\r?\n){10}[ \t]*\r?\n
Expand All @@ -56,4 +55,3 @@ VERIFY:(?:[^\r\n]*\r?\n){10}[ \t]*\r?\n
SOSCOMMAND:ClrStack -i -c 4
VERIFY:(?:[^\r\n]*\r?\n){11}[ \t]*\r?\n
!VERIFY:(?:[^\r\n]*\r?\n){13}[ \t]*\r?\n
ENDIF:CDAC_NO_FALLBACK_TESTING
2 changes: 0 additions & 2 deletions src/tests/SOS.UnitTests/Scripts/DualRuntimes.script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,10 @@ VERIFY:.*OS Thread Id:\s+0x<HEXVAL>\s+.*
VERIFY:\s+Child\s+SP\s+IP\s+Call Site\s+

# Verify that ClrStack with the ICorDebug options works
!IFDEF:CDAC_NO_FALLBACK_TESTING
SOSCOMMAND:ClrStack -i
VERIFY:.*\s+Dumping managed stack and managed variables using ICorDebug.\s+
VERIFY:.*\s+Child\s+SP\s+IP\s+Call Site\s+
VERIFY:.*\s+Stack walk complete.\s+
ENDIF:CDAC_NO_FALLBACK_TESTING

# Verify that Threads (clrthreads) works
IFDEF:DOTNETDUMP
Expand Down
2 changes: 0 additions & 2 deletions src/tests/SOS.UnitTests/Scripts/DynamicMethod.script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ CONTINUE

LOADSOS

!IFDEF:CDAC_NO_FALLBACK_TESTING
SOSCOMMAND:ClrStack -i -a
VERIFY:\s+LOCALS:\s+

SOSCOMMAND:DumpIL <POUT>.*System\.Reflection\.Emit\.DynamicMethod dynamicMethod @ 0x(<HEXVAL>).*\s+<POUT>
VERIFY:\s+IL_0000: ldarg.0\s+
VERIFY:\s+IL_0001: ldc.i4.0\s+
ENDIF:CDAC_NO_FALLBACK_TESTING
2 changes: 0 additions & 2 deletions src/tests/SOS.UnitTests/Scripts/MiniDumpLocalVarLookup.script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,5 @@ LOADSOS
SOSCOMMAND:clrstack -l

# stackwalk through ICorDebug with locals
!IFDEF:CDAC_NO_FALLBACK_TESTING
SOSCOMMAND:clrstack -i -l
VERIFY:int\s+length\s+=\s+13
ENDIF:CDAC_NO_FALLBACK_TESTING
2 changes: 0 additions & 2 deletions src/tests/SOS.UnitTests/Scripts/StackAndOtherTests.script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ VERIFY:.*\s+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.Program\.Main\(.*\)\s+\[(?i:.*[
IFDEF:NETCORE_OR_DOTNETDUMP

# Verify that ClrStack with the ICorDebug options works
!IFDEF:CDAC_NO_FALLBACK_TESTING
SOSCOMMAND:ClrStack -i
VERIFY:.*\s+Dumping managed stack and managed variables using ICorDebug.\s+
VERIFY:.*\s+Child\s+SP\s+IP\s+Call Site\s+
Expand All @@ -176,7 +175,6 @@ VERIFY:.*\s+<HEXVAL>\s+<HEXVAL>\s+\[DEFAULT\] I4 SymbolTestApp\.Program\.Foo2\(.
VERIFY:.*\s+<HEXVAL>\s+<HEXVAL>\s+\[DEFAULT\] I4 SymbolTestApp\.Program\.Foo1\(.*\)\s+\(.*\)\s+
VERIFY:.*\s+<HEXVAL>\s+<HEXVAL>\s+\[DEFAULT\] Void SymbolTestApp\.Program\.Main\(.*\)\s+\(.*\)\s+
VERIFY:.*\s+Stack walk complete.\s+
ENDIF:CDAC_NO_FALLBACK_TESTING

SOSCOMMAND: runtimes

Expand Down
2 changes: 0 additions & 2 deletions src/tests/SOS.UnitTests/Scripts/StackTests.script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ IFDEF:NETCORE_OR_DOTNETDUMP
!IFDEF:ALPINE

# 5) Verifying that ClrStack with the ICorDebug options works
!IFDEF:CDAC_NO_FALLBACK_TESTING
SOSCOMMAND:ClrStack -i
VERIFY:.*\s+Dumping managed stack and managed variables using ICorDebug.\s+
VERIFY:.*\s+Child\s+SP\s+IP\s+Call Site\s+
Expand All @@ -148,7 +147,6 @@ VERIFY:\s+\+ System.FormatException ex @ 0x<HEXVAL>\s+
ENDIF:SINGLE_FILE_APP
VERIFY:.*\s+<HEXVAL>\s+<HEXVAL>\s+\[DEFAULT\] Void NestedExceptionTest\.Program\.Main\(.*\)\s+\(.*\)\s+
VERIFY:.*\s+Stack walk complete.\s+
ENDIF:CDAC_NO_FALLBACK_TESTING

ENDIF:ALPINE
ENDIF:NETCORE_OR_DOTNETDUMP
Expand Down
2 changes: 0 additions & 2 deletions src/tests/SOS.UnitTests/Scripts/WebApp.script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,10 @@ VERIFY:\s+eax=<HEXVAL>\s+ebx=<HEXVAL>\s+ecx=<HEXVAL>\s+
ENDIF:X86

# Verify that ClrStack with the ICorDebug options works
!IFDEF:CDAC_NO_FALLBACK_TESTING
SOSCOMMAND:ClrStack -i
VERIFY:.*\s+Dumping managed stack and managed variables using ICorDebug.\s+
VERIFY:.*\s+Child\s+SP\s+IP\s+Call Site\s+
VERIFY:.*\s+Stack walk complete.\s+
ENDIF:CDAC_NO_FALLBACK_TESTING

# Verify that Threads (clrthreads) works
SOSCOMMAND:clrthreads
Expand Down