@@ -52,7 +52,6 @@ def test_negative_indexing(self):
52
52
self .build ()
53
53
self .validate_negative_indexing ()
54
54
55
- @expectedFailureAll (oslist = ["windows" ])
56
55
def test_StepInstruction (self ):
57
56
"""Test that StepInstruction preserves the plan stack."""
58
57
self .build ()
@@ -324,34 +323,40 @@ def step_instruction_in_called_function(self):
324
323
self .assertGreater (
325
324
call_me_bkpt .GetNumLocations (), 0 , "Got at least one location in call_me"
326
325
)
326
+
327
+ # On Windows this may be the full name "void __cdecl call_me(bool)",
328
+ # elsewhere it's just "call_me(bool)".
329
+ expected_name = r".*call_me\(bool\)$"
330
+
327
331
# Now run the expression, this will fail because we stopped at a breakpoint:
328
332
self .runCmd ("expr -i 0 -- call_me(true)" , check = False )
329
333
# Now we should be stopped in call_me:
330
- self .assertEqual (
331
- thread .frames [0 ].name , "call_me(bool)" , "Stopped in call_me(bool)"
334
+ self .assertRegex (
335
+ thread .frames [0 ].name , expected_name , "Stopped in call_me(bool)"
332
336
)
337
+
333
338
# Now do a various API steps. These should not cause the expression context to get unshipped:
334
339
thread .StepInstruction (False )
335
- self .assertEqual (
340
+ self .assertRegex (
336
341
thread .frames [0 ].name ,
337
- "call_me(bool)" ,
342
+ expected_name ,
338
343
"Still in call_me(bool) after StepInstruction" ,
339
344
)
340
345
thread .StepInstruction (True )
341
- self .assertEqual (
346
+ self .assertRegex (
342
347
thread .frames [0 ].name ,
343
- "call_me(bool)" ,
348
+ expected_name ,
344
349
"Still in call_me(bool) after NextInstruction" ,
345
350
)
346
351
thread .StepInto ()
347
- self .assertEqual (
352
+ self .assertRegex (
348
353
thread .frames [0 ].name ,
349
- "call_me(bool)" ,
354
+ expected_name ,
350
355
"Still in call_me(bool) after StepInto" ,
351
356
)
352
357
thread .StepOver (False )
353
- self .assertEqual (
358
+ self .assertRegex (
354
359
thread .frames [0 ].name ,
355
- "call_me(bool)" ,
360
+ expected_name ,
356
361
"Still in call_me(bool) after StepOver" ,
357
362
)
0 commit comments