Skip to content

Commit 566c6e4

Browse files
leculverCopilot
leculver
and
Copilot
committed
Fix native to IL line number mappings in SOS test scripts
Remove alternative line number matches (e.g., (53|57), (11|20)) that were needed for older runtime versions. Now that the IL conversion fix has landed, tests should expect the correct line numbers only. Relates to #794 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 1373582 commit 566c6e4

6 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎src/tests/SOS.UnitTests/Scripts/DivZero.script‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ VERIFY:\[.*[\\|/]Debuggees[\\|/].*DivZero[\\|/]DivZero\.cs @ 24\s*\]\s*
3737
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+[Dd]iv[Zz]ero.*!C\.F2(\(.*\))?\+0x<HEXVAL>\s+
3838
VERIFY:\[.*[\\|/]Debuggees[\\|/].*DivZero[\\|/]DivZero\.cs @ 36\s*\]\s*
3939
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+[Dd]iv[Zz]ero.*!C\.Main(\(.*\))?\+0x<HEXVAL>\s+
40-
VERIFY:\[.*[\\|/]Debuggees[\\|/].*DivZero[\\|/]DivZero\.cs @ (57|56)\s*\]\s*
40+
VERIFY:\[.*[\\|/]Debuggees[\\|/].*DivZero[\\|/]DivZero\.cs @ 57\s*\]\s*
4141

4242
# Verify that Threads (clrthreads) works
4343
SOSCOMMAND:clrthreads
@@ -57,4 +57,4 @@ VERIFY:\s+Child\s+SP\s+IP\s+Call Site\s+
5757
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+(\*\*\* WARNING: Unable to verify checksum for DivZero.exe\s*)?C\.DivideByZero(\(.*\))?\s+\[(?i:.*[\\|/]DivZero\.cs) @ 15\s*\]\s+
5858
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+C\.F3(\(.*\))?\s+\[(?i:.*[\\|/]DivZero\.cs) @ 24\s*\]\s+
5959
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+C\.F2(\(.*\))?\s+\[(?i:.*[\\|/]DivZero\.cs) @ 36\s*\]\s+
60-
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+C\.Main(\(.*\))?\s+\[(?i:.*[\\|/]DivZero\.cs) @ (57|56)\s*\]\s+
60+
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+C\.Main(\(.*\))?\s+\[(?i:.*[\\|/]DivZero\.cs) @ 57\s*\]\s+

‎src/tests/SOS.UnitTests/Scripts/NestedExceptionTest.script‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ VERIFY:InnerException:\s+System\.FormatException, Use !?printexception <HEXVAL>
9393
VERIFY:StackTrace \(generated\):
9494
VERIFY:\s+SP\s+IP\s+Function\s+
9595
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+[Nn]ested[Ee]xception[Tt]est.*!NestedExceptionTest\.Program\.Main(\(.*\))?\+0x<HEXVAL>\s*
96-
VERIFY:\[.*[\\|/]Debuggees[\\|/].*[Nn]ested[Ee]xception[Tt]est[\\|/][Nn]ested[Ee]xception[Tt]est\.cs @ (11|20)\s*\]\s*
96+
VERIFY:\[.*[\\|/]Debuggees[\\|/].*[Nn]ested[Ee]xception[Tt]est[\\|/][Nn]ested[Ee]xception[Tt]est\.cs @ 20\s*\]\s*
9797
VERIFY:(StackTraceString: <none>\s+)?
9898
VERIFY:HResult:\s+80131509\s+
9999
VERIFY:There are nested exceptions on this thread. Run with -nested for details
@@ -114,4 +114,4 @@ SOSCOMMAND:ClrStack
114114
VERIFY:.*OS Thread Id:\s+0x<HEXVAL>\s+.*
115115
VERIFY:\s+Child\s+SP\s+IP\s+Call Site\s+
116116
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+NestedExceptionTest\.Program\.Main(\(.*\))?\s*
117-
VERIFY:\[.*[\\|/]Debuggees[\\|/].*[Nn]ested[Ee]xception[Tt]est[\\|/][Nn]ested[Ee]xception[Tt]est\.cs @ (11|20)\s*\]\s*
117+
VERIFY:\[.*[\\|/]Debuggees[\\|/].*[Nn]ested[Ee]xception[Tt]est[\\|/][Nn]ested[Ee]xception[Tt]est\.cs @ 20\s*\]\s*

‎src/tests/SOS.UnitTests/Scripts/OtherCommands.script‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ ENDIF:DESKTOP
3939

4040
CONTINUE
4141
SOSCOMMAND:ClrStack
42-
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.Program\.Foo2\(.*\)\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ (31|32)\]\s*
42+
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.Program\.Foo2\(.*\)\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ 32\]\s*
4343

4444
CONTINUE
4545
SOSCOMMAND:ClrStack
46-
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.Program\.Foo4\(.*\)\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ (37|57)\]\s*
46+
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.Program\.Foo4\(.*\)\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ 37\]\s*
4747

4848
ENDIF:UNIX_SINGLE_FILE_APP
4949
ENDIF:ALPINE

‎src/tests/SOS.UnitTests/Scripts/StackAndOtherTests.script‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ENDIF:DESKTOP
4040

4141
CONTINUE
4242
SOSCOMMAND:ClrStack
43-
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.Program\.Foo2\(.*\)\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ (31|32)\]\s*
43+
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.Program\.Foo2\(.*\)\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ 32\]\s*
4444

4545
CONTINUE
4646
SOSCOMMAND:ClrStack
@@ -67,7 +67,7 @@ SOSCOMMAND:SOSStatus
6767
SOSCOMMAND:ClrStack
6868
VERIFY:.*OS Thread Id:\s+0x<HEXVAL>\s+.*
6969
VERIFY:\s+Child\s+SP\s+IP\s+Call Site\s+
70-
VERIFY:.*\s+<HEXVAL>\s+<HEXVAL>.*\s+SymbolTestApp\.Program\.Foo4\(System\.String\)\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ (53|57)\]\s*
70+
VERIFY:.*\s+<HEXVAL>\s+<HEXVAL>.*\s+SymbolTestApp\.Program\.Foo4\(System\.String\)\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ 57\]\s*
7171
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.Program\.Foo2\(.*\)\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ 32\]\s*
7272
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.Program\.Foo1\(.*\)\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ 27\]\s*
7373
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.Program\.Main\(.*\)\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ 22\]\s*
@@ -93,7 +93,7 @@ ENDIF:MAJOR_RUNTIME_VERSION_GE_7
9393
SOSCOMMAND:ClrStack -f
9494
VERIFY:.*OS Thread Id:\s+0x<HEXVAL>\s+.*
9595
VERIFY:\s+Child\s+SP\s+IP\s+Call Site\s+
96-
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.(dll|exe)!SymbolTestApp\.Program\.Foo4\(System\.String\)\s+\+\s+<DECVAL>\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ (53|57)\]\s*
96+
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.(dll|exe)!SymbolTestApp\.Program\.Foo4\(System\.String\)\s+\+\s+<DECVAL>\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ 57\]\s*
9797
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.(dll|exe)!SymbolTestApp\.Program\.Foo2\(.*\)\s+\+\s+<DECVAL>\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ 32\]\s*
9898
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.(dll|exe)!SymbolTestApp\.Program\.Foo1\(.*\)\s+\+\s+<DECVAL>\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ 27\]\s*
9999
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.(dll|exe)!SymbolTestApp\.Program\.Main\(.*\)\s+\+\s+<DECVAL>\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ 22\]\s*
@@ -102,7 +102,7 @@ VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.(dll|exe)!SymbolTestApp\.Program\
102102
SOSCOMMAND:ClrStack -a
103103
VERIFY:.*OS Thread Id:\s+0x<HEXVAL>\s+.*
104104
VERIFY:\s+Child\s+SP\s+IP\s+Call Site\s+
105-
VERIFY:.*\s+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.Program\.Foo4\(System\.String\)\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ (53|57)\]\s*
105+
VERIFY:.*\s+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.Program\.Foo4\(System\.String\)\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ 57\]\s*
106106
VERIFY:\s+PARAMETERS:\s+
107107
VERIFY:\s+dllPath \(0x<HEXVAL>\) = 0x<HEXVAL>\s+
108108
VERIFY:.*\s+LOCALS:\s+
@@ -116,7 +116,7 @@ SOSCOMMAND:ClrStack -r
116116
VERIFY:.*OS Thread Id:\s+0x<HEXVAL>\s+.*
117117
VERIFY:\s+Child\s+SP\s+IP\s+Call Site\s+
118118

119-
VERIFY:.*\s+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.Program\.Foo4\(System\.String\)\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ (53|57)\]\s*
119+
VERIFY:.*\s+<HEXVAL>\s+<HEXVAL>\s+SymbolTestApp\.Program\.Foo4\(System\.String\)\s+\[(?i:.*[\\|/]SymbolTestApp\.cs) @ 57\]\s*
120120
IFDEF:ARM
121121
VERIFY:\s+r0=<HEXVAL>\s+r1=<HEXVAL>\s+r2=<HEXVAL>\s+
122122
ENDIF:ARM
@@ -234,7 +234,7 @@ ENDIF:DOTNETDUMP
234234
SOSCOMMAND:ClrStack
235235
SOSCOMMAND:IP2MD <POUT>.*\s+(<HEXVAL>)\s+SymbolTestApp\.Program\.Foo4.*\s+<POUT>
236236
VERIFY:.*\s+Method Name:\s+SymbolTestApp\.Program\.Foo4\(System\.String\)\s+
237-
VERIFY:.*\s+Source file:\s+(?i:.*[\\|/]SymbolTestApp\.cs) @ (53|57)\s+
237+
VERIFY:.*\s+Source file:\s+(?i:.*[\\|/]SymbolTestApp\.cs) @ 57\s+
238238

239239
# Verify that DumpIL works (depends on the IP2MD right above)
240240
SOSCOMMAND:DumpIL <POUT>\s*MethodDesc:\s+(<HEXVAL>)\s*<POUT>
@@ -254,7 +254,7 @@ SOSCOMMAND:clru <POUT>\s*MethodDesc:\s+(<HEXVAL>)\s*<POUT>
254254
VERIFY:\s*Normal JIT generated code\s+
255255
VERIFY:\s+SymbolTestApp\.Program\.Foo4\(System\.String\)\s+
256256
VERIFY:\s+Begin\s+<HEXVAL>,\s+size\s+<HEXVAL>\s+
257-
VERIFY:\s+(?i:.*[\\|/]SymbolTestApp\.cs) @ (53|57):\s+
257+
VERIFY:\s+(?i:.*[\\|/]SymbolTestApp\.cs) @ 57:\s+
258258

259259
# Verify that "u" with no line info works
260260
SOSCOMMAND:clru -n <PREVPOUT>
@@ -267,7 +267,7 @@ SOSCOMMAND:clru -o <PREVPOUT>
267267
VERIFY:\s*Normal JIT generated code\s+
268268
VERIFY:\s+SymbolTestApp\.Program\.Foo4\(System\.String\)\s+
269269
VERIFY:\s+Begin\s+<HEXVAL>,\s+size\s+<HEXVAL>\s+
270-
VERIFY:\s+(?i:.*[\\|/]SymbolTestApp\.cs) @ (53|57):\s+
270+
VERIFY:\s+(?i:.*[\\|/]SymbolTestApp\.cs) @ 57:\s+
271271

272272
ENDIF:DOTNETDUMP
273273

‎src/tests/SOS.UnitTests/Scripts/StackTests.script‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ENDIF:ALPINE
2020
SOSCOMMAND:ClrStack
2121
VERIFY:.*OS Thread Id:\s+0x<HEXVAL>\s+.*
2222
VERIFY:\s+Child\s+SP\s+IP\s+Call Site\s+
23-
VERIFY:\s+<HEXVAL>\s+<HEXVAL>.*\s+NestedExceptionTest\.Program\.Main\(.*\)\s+\[(?i:.*[\\|/]NestedExceptionTest\.cs) @ (11|20)\s*\]\s+
23+
VERIFY:\s+<HEXVAL>\s+<HEXVAL>.*\s+NestedExceptionTest\.Program\.Main\(.*\)\s+\[(?i:.*[\\|/]NestedExceptionTest\.cs) @ 20\s*\]\s+
2424
IFDEF:64BIT
2525
VERIFY:.*\s+<HEXVAL>\s+<HEXVAL>\s+NestedExceptionTest\.Program\.Main\(.*\)\s+\[(?i:.*[\\|/]NestedExceptionTest\.cs) @ 16\s*\]\s+
2626
ENDIF:64BIT
@@ -42,7 +42,7 @@ ENDIF:DOTNETDUMP
4242
SOSCOMMAND:ClrStack -f
4343
VERIFY:.*OS Thread Id:\s+0x<HEXVAL>\s+.*
4444
VERIFY:\s+Child\s+SP\s+IP\s+Call Site\s+
45-
VERIFY:.*\s+<HEXVAL>\s+<HEXVAL>\s+(?i:NestedExceptionTest.*)!NestedExceptionTest\.Program\.Main\(.*\)\s+\+\s+<DECVAL>\s+\[(?i:.*[\\|/]NestedExceptionTest\.cs) @ (11|20)\s*\]\s+
45+
VERIFY:.*\s+<HEXVAL>\s+<HEXVAL>\s+(?i:NestedExceptionTest.*)!NestedExceptionTest\.Program\.Main\(.*\)\s+\+\s+<DECVAL>\s+\[(?i:.*[\\|/]NestedExceptionTest\.cs) @ 20\s*\]\s+
4646
IFDEF:64BIT
4747
VERIFY:.*\s+<HEXVAL>\s+<HEXVAL>\s+(?i:NestedExceptionTest.*)!NestedExceptionTest\.Program\.Main\(.*\)\s+\+\s+<DECVAL>\s+\[(?i:.*[\\|/]NestedExceptionTest\.cs) @ 16\s*\]\s+
4848
ENDIF:64BIT
@@ -51,7 +51,7 @@ ENDIF:64BIT
5151
SOSCOMMAND:ClrStack -a
5252
VERIFY:.*OS Thread Id:\s+0x<HEXVAL>\s+.*
5353
VERIFY:\s+Child\s+SP\s+IP\s+Call Site\s+
54-
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+NestedExceptionTest\.Program\.Main\(.*\)\s+\[(?i:.*[\\|/]NestedExceptionTest\.cs) @ (11|20)\s*\]\s+
54+
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+NestedExceptionTest\.Program\.Main\(.*\)\s+\[(?i:.*[\\|/]NestedExceptionTest\.cs) @ 20\s*\]\s+
5555
VERIFY:\s+PARAMETERS:\s+
5656
VERIFY:\s+args \(0x<HEXVAL>\) = 0x<HEXVAL>\s+
5757
VERIFY:\s+LOCALS:\s+
@@ -69,7 +69,7 @@ SOSCOMMAND:ClrStack -r
6969
VERIFY:.*OS Thread Id:\s+0x<HEXVAL>\s+.*
7070
VERIFY:\s+Child\s+SP\s+IP\s+Call Site\s+
7171

72-
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+NestedExceptionTest\.Program\.Main\(.*\)\s+\[(?i:.*[\\|/]NestedExceptionTest\.cs) @ (11|20)\s*\]\s+
72+
VERIFY:\s+<HEXVAL>\s+<HEXVAL>\s+NestedExceptionTest\.Program\.Main\(.*\)\s+\[(?i:.*[\\|/]NestedExceptionTest\.cs) @ 20\s*\]\s+
7373
IFDEF:ARM
7474
VERIFY:\s+r0=<HEXVAL>\s+r1=<HEXVAL>\s+r2=<HEXVAL>\s+
7575
ENDIF:ARM

‎src/tests/SOS.UnitTests/Scripts/TaskNestedException.script‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ VERIFY:\s+SP\s+IP\s+Function\s+
3030
VERIFY:\s+<HEXVAL>\s+<HEXVAL>.+RandomTest(::|\.)RandomUserTask\.<\.ctor>.+\+0x<HEXVAL>\s*
3131
!IFDEF:DESKTOP
3232
!IFDEF:TRIAGE_DUMP
33-
VERIFY:[.+[\\|/]Debuggees[\\|/].*[Tt]ask[Nn]ested[Ee]xception[\\|/][Rr]andom[Uu]ser[Ll]ibrary[\\|/][Rr]andom[Uu]ser[Tt]ask\.cs @ (19|26)\]
33+
VERIFY:[.+[\\|/]Debuggees[\\|/].*[Tt]ask[Nn]ested[Ee]xception[\\|/][Rr]andom[Uu]ser[Ll]ibrary[\\|/][Rr]andom[Uu]ser[Tt]ask\.cs @ 26\]
3434
ENDIF:TRIAGE_DUMP
3535
ENDIF:DESKTOP
3636

@@ -44,7 +44,7 @@ VERIFY:\s+SP\s+IP\s+Function\s+
4444
VERIFY:\s+<HEXVAL>\s+<HEXVAL>.+RandomTest(::|\.)RandomUserTask\.InnerException(\(\))?\+0x<HEXVAL>\s*
4545
!IFDEF:DESKTOP
4646
!IFDEF:TRIAGE_DUMP
47-
VERIFY:[.+[\\|/]Debuggees[\\|/].*[Tt]ask[Nn]ested[Ee]xception[\\|/][Rr]andom[Uu]ser[Ll]ibrary[\\|/][Rr]andom[Uu]ser[Tt]ask\.cs @ (37|38)\]
47+
VERIFY:[.+[\\|/]Debuggees[\\|/].*[Tt]ask[Nn]ested[Ee]xception[\\|/][Rr]andom[Uu]ser[Ll]ibrary[\\|/][Rr]andom[Uu]ser[Tt]ask\.cs @ 38\]
4848
ENDIF:TRIAGE_DUMP
4949
ENDIF:DESKTOP
5050
VERIFY:\s+<HEXVAL>\s+<HEXVAL>.+RandomTest(::|\.)RandomUserTask\.<\.ctor>.+\+0x<HEXVAL>\s*

0 commit comments

Comments
 (0)