Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
Disable eestack/dumpstack testing on 7.0
  • Loading branch information
Mike McLaughlin committed Sep 14, 2022
commit 09b04fa33f85faac48e97cbf375a8ddacb1742e8
2 changes: 2 additions & 0 deletions src/SOS/SOS.UnitTests/Scripts/StackAndOtherTests.script
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ ENDIF:NETCORE_OR_DOTNETDUMP
!IFDEF:DOTNETDUMP
!IFDEF:ARM64
!IFDEF:ARM
!IFDEF:MAJOR_RUNTIME_VERSION_GE_7

# Verify DumpStack works
SOSCOMMAND:DumpStack
Expand All @@ -218,6 +219,7 @@ SOSCOMMAND:EEStack
VERIFY:.*Child(-SP|EBP|FP)\s+RetAddr\s+Caller, Callee\s+
VERIFY:(.*\s+<HEXVAL>\s+<HEXVAL>\s+\(MethodDesc\s+<HEXVAL>\s+(\+\s*0x<HEXVAL>\s+)?SymbolTestApp\.Program\.Foo4\(System\.String\)\),\s+calling.*\s+)|(.*\s+<HEXVAL>\s+<HEXVAL>\s+\(MethodDesc\s+<HEXVAL>\s+(\+\s*0x<HEXVAL>\s+)?SymbolTestApp\.Program\.Foo2\(Int32, System\.String\)\),\s+calling.*\s+)

ENDIF:MAJOR_RUNTIME_VERSION_GE_7
ENDIF:ARM
ENDIF:ARM64
ENDIF:DOTNETDUMP
Expand Down
2 changes: 2 additions & 0 deletions src/SOS/SOS.UnitTests/Scripts/StackTests.script
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ VERIFY:.*\s+<HEXVAL>\s+<HEXVAL>\s+System\.String.*
!IFDEF:DOTNETDUMP
!IFDEF:ARM64
!IFDEF:ARM
!IFDEF:MAJOR_RUNTIME_VERSION_GE_7

# 9) Verify DumpStack works
SOSCOMMAND:DumpStack
Expand All @@ -172,6 +173,7 @@ SOSCOMMAND:EEStack
VERIFY:.*Child(-SP|EBP|FP)\s+RetAddr\s+Caller, Callee\s+
VERIFY:.*\s+<HEXVAL>\s+<HEXVAL>\s+\(MethodDesc\s+<HEXVAL>\s+\+\s*0x<HEXVAL>\s+NestedExceptionTest\.Program\.Main\(System\.String\[\]\)\),\s+calling.*

ENDIF:MAJOR_RUNTIME_VERSION_GE_7
ENDIF:ARM
ENDIF:ARM64
ENDIF:DOTNETDUMP
2 changes: 0 additions & 2 deletions src/SOS/SOS.UnitTests/Scripts/WebApp.script
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#
# Tests the various SOS stack and other commands against a webapp 3.x app
#
# Commands Verified: ClrStack, DumpStackObjects, DumpStack, EEStack, IP2MD, u, Name2EE, Threads (clrthreads)
#

CONTINUE

Expand Down