From cd0874325aff05ee45639173d69825fd5522c766 Mon Sep 17 00:00:00 2001 From: Noah Falk Date: Fri, 21 Aug 2026 01:57:43 -0700 Subject: [PATCH] Run all SOS checks in cDAC verify mode Remove the no-fallback script exemptions and delete the obsolete cDAC test launchers whose category filter matched no tests. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- eng/testsoscdac.cmd | 2 -- eng/testsoscdac.sh | 18 ------------------ src/tests/SOS.UnitTests/SOSRunner.cs | 4 ---- .../Scripts/ClrStackWithNumberOfFrames.script | 2 -- .../SOS.UnitTests/Scripts/DualRuntimes.script | 2 -- .../SOS.UnitTests/Scripts/DynamicMethod.script | 2 -- .../Scripts/MiniDumpLocalVarLookup.script | 2 -- .../Scripts/StackAndOtherTests.script | 2 -- .../SOS.UnitTests/Scripts/StackTests.script | 2 -- src/tests/SOS.UnitTests/Scripts/WebApp.script | 2 -- 10 files changed, 38 deletions(-) delete mode 100644 eng/testsoscdac.cmd delete mode 100644 eng/testsoscdac.sh diff --git a/eng/testsoscdac.cmd b/eng/testsoscdac.cmd deleted file mode 100644 index 0083e1b094..0000000000 --- a/eng/testsoscdac.cmd +++ /dev/null @@ -1,2 +0,0 @@ -set SOS_TEST_DAC_MODE=cdacfallback -%~dp0..\.dotnet\dotnet.exe test --no-build --logger "console;verbosity=detailed" %~dp0..\src\tests\SOS.UnitTests\SOS.UnitTests.csproj --filter "Category=CDACCompatible" diff --git a/eng/testsoscdac.sh b/eng/testsoscdac.sh deleted file mode 100644 index fb3a8fa996..0000000000 --- a/eng/testsoscdac.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -source="${BASH_SOURCE[0]}" - -# resolve $SOURCE until the file is no longer a symlink -while [[ -h $source ]]; do - scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - source="$(readlink "$source")" - - # if $source was a relative symlink, we need to resolve it relative to the path where the - # symlink file was located - [[ $source != /* ]] && source="$scriptroot/$source" -done - -scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -export LLDB_PATH=/usr/bin/lldb -export SOS_TEST_DAC_MODE=cdacfallback -$scriptroot/../.dotnet/dotnet test --no-build --logger "console;verbosity=detailed" $scriptroot/../src/tests/SOS.UnitTests/SOS.UnitTests.csproj --filter "Category=CDACCompatible" diff --git a/src/tests/SOS.UnitTests/SOSRunner.cs b/src/tests/SOS.UnitTests/SOSRunner.cs index d45026f038..92cc00d22c 100644 --- a/src/tests/SOS.UnitTests/SOSRunner.cs +++ b/src/tests/SOS.UnitTests/SOSRunner.cs @@ -1636,10 +1636,6 @@ private HashSet GetEnabledDefines() { defines.Add("HOST_RUNTIME_NONE"); } - if (_config.DacMode == DacMode.CDacVerify) - { - defines.Add("CDAC_NO_FALLBACK_TESTING"); - } return defines; } diff --git a/src/tests/SOS.UnitTests/Scripts/ClrStackWithNumberOfFrames.script b/src/tests/SOS.UnitTests/Scripts/ClrStackWithNumberOfFrames.script index 5dbe404d4b..29fedbfa2e 100644 --- a/src/tests/SOS.UnitTests/Scripts/ClrStackWithNumberOfFrames.script +++ b/src/tests/SOS.UnitTests/Scripts/ClrStackWithNumberOfFrames.script @@ -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 @@ -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 diff --git a/src/tests/SOS.UnitTests/Scripts/DualRuntimes.script b/src/tests/SOS.UnitTests/Scripts/DualRuntimes.script index 8a3b872882..02dfa9555e 100644 --- a/src/tests/SOS.UnitTests/Scripts/DualRuntimes.script +++ b/src/tests/SOS.UnitTests/Scripts/DualRuntimes.script @@ -29,12 +29,10 @@ VERIFY:.*OS Thread Id:\s+0x\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 diff --git a/src/tests/SOS.UnitTests/Scripts/DynamicMethod.script b/src/tests/SOS.UnitTests/Scripts/DynamicMethod.script index 2a4c31aeba..ea20901c36 100644 --- a/src/tests/SOS.UnitTests/Scripts/DynamicMethod.script +++ b/src/tests/SOS.UnitTests/Scripts/DynamicMethod.script @@ -3,11 +3,9 @@ CONTINUE LOADSOS -!IFDEF:CDAC_NO_FALLBACK_TESTING SOSCOMMAND:ClrStack -i -a VERIFY:\s+LOCALS:\s+ SOSCOMMAND:DumpIL .*System\.Reflection\.Emit\.DynamicMethod dynamicMethod @ 0x().*\s+ VERIFY:\s+IL_0000: ldarg.0\s+ VERIFY:\s+IL_0001: ldc.i4.0\s+ -ENDIF:CDAC_NO_FALLBACK_TESTING diff --git a/src/tests/SOS.UnitTests/Scripts/MiniDumpLocalVarLookup.script b/src/tests/SOS.UnitTests/Scripts/MiniDumpLocalVarLookup.script index 38dedc2522..8ce9245019 100644 --- a/src/tests/SOS.UnitTests/Scripts/MiniDumpLocalVarLookup.script +++ b/src/tests/SOS.UnitTests/Scripts/MiniDumpLocalVarLookup.script @@ -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 diff --git a/src/tests/SOS.UnitTests/Scripts/StackAndOtherTests.script b/src/tests/SOS.UnitTests/Scripts/StackAndOtherTests.script index fa3336be07..ebb6ca6ff2 100644 --- a/src/tests/SOS.UnitTests/Scripts/StackAndOtherTests.script +++ b/src/tests/SOS.UnitTests/Scripts/StackAndOtherTests.script @@ -149,7 +149,6 @@ VERIFY:.*\s+\s+\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+ @@ -176,7 +175,6 @@ VERIFY:.*\s+\s+\s+\[DEFAULT\] I4 SymbolTestApp\.Program\.Foo2\(. VERIFY:.*\s+\s+\s+\[DEFAULT\] I4 SymbolTestApp\.Program\.Foo1\(.*\)\s+\(.*\)\s+ VERIFY:.*\s+\s+\s+\[DEFAULT\] Void SymbolTestApp\.Program\.Main\(.*\)\s+\(.*\)\s+ VERIFY:.*\s+Stack walk complete.\s+ -ENDIF:CDAC_NO_FALLBACK_TESTING SOSCOMMAND: runtimes diff --git a/src/tests/SOS.UnitTests/Scripts/StackTests.script b/src/tests/SOS.UnitTests/Scripts/StackTests.script index e7cf7e1bbd..18cc9af726 100644 --- a/src/tests/SOS.UnitTests/Scripts/StackTests.script +++ b/src/tests/SOS.UnitTests/Scripts/StackTests.script @@ -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+ @@ -148,7 +147,6 @@ VERIFY:\s+\+ System.FormatException ex @ 0x\s+ ENDIF:SINGLE_FILE_APP VERIFY:.*\s+\s+\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 diff --git a/src/tests/SOS.UnitTests/Scripts/WebApp.script b/src/tests/SOS.UnitTests/Scripts/WebApp.script index d121632dde..6842eb063d 100644 --- a/src/tests/SOS.UnitTests/Scripts/WebApp.script +++ b/src/tests/SOS.UnitTests/Scripts/WebApp.script @@ -95,12 +95,10 @@ VERIFY:\s+eax=\s+ebx=\s+ecx=\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