On 01/31/2012 12:21 AM, Pedro Alves wrote:
>> > -gdb_test "step"
>> > +gdb_test "step" ".*" "step into main"
> into, or in?  AFAICS, you're already in main before the step.
> 

OK, Change this message to "step in the main".

>> >  gdb_test "bt" "\\s*\\#0\\s+main.*" "step after all ignored"
>> >  
>> >  #
>> > @@ -96,11 +96,12 @@ gdb_test "info skip" \
>> >    "Num\\s+Type\\s+Enb\\s+Address\\s+What\\s*
>> >  2\\s+function\\s+y\\s+0x\[0-9a-f\]+ main at .*$srcfile:\[0-9\]+\\s*
>> >  3\\s+file\\s+y\\s+.*$srcfile1\\s*
>> > -4\\s+function\\s+y\\s+0x\[0-9a-f\]+ baz at .*$srcfile1:\[0-9\]+\\s*"
>> > +4\\s+function\\s+y\\s+0x\[0-9a-f\]+ baz at .*$srcfile1:\[0-9\]+\\s*" \
>> > +    "info skip (delete 1)"
>> >  
>> >  if ![runto_main] { fail "skip tests suppressed" }
>> >  gdb_test "step" "foo \\(\\) at.*" "step after deleting 1 (1)"
>> > -gdb_test "step"; # Return from foo()
>> > +gdb_test "step" ".*" "step after deleting 1" ; # Return from foo()
>> >  gdb_test "step" "main \\(\\) at.*" "step after deleting 1 (2)"
> Shouldn't that be
> 
>  gdb_test "step" "foo \\(\\) at.*" "step after deleting 1 (1)"
>  gdb_test "step" ".*" "step after deleting 1 (2)" # Return from foo()
>  gdb_test "step" "main \\(\\) at.*" "step after deleting 1 (3)"
> 
> ?  That is: 1, 2, 3.
> 

OK fixed.

>> >  
>> >  #
>> > @@ -114,10 +115,10 @@ gdb_test "info skip 3" ".*\\n3\\s+file\\s+n.*" \
>> >  
>> >  if ![runto_main] { fail "skip tests suppressed" }
>> >  gdb_test "step" "bar \\(\\) at.*" "step after disabling 3 (1)"
>> > -gdb_test "step"; # Return from foo()
>> > -gdb_test "step" "foo \\(\\) at.*" "step after disabling 3 (2)"
>> > -gdb_test "step"; # Return from bar()
>> > -gdb_test "step" "main \\(\\) at.*" "step after disabling 3 (3)"
>> > +gdb_test "step" ".*" "step after disabling 3 (2)"; # Return from foo()
>> > +gdb_test "step" "foo \\(\\) at.*" "step after disabling 3 (3)"
>> > +gdb_test "step" ".*" "step after disabling 3 (4)"; # Return from bar()
>> > +gdb_test "step" "main \\(\\) at.*" "step after disabling 3 (5)"
>> >  
>> >  #
>> >  # Enable skiplist entry 3 and make sure we step over it like before.
>> > @@ -127,9 +128,9 @@ gdb_test "skip enable 3"
>> >  gdb_test "info skip 3" ".*\\n3\\s+file\\s+y.*" \
>> >    "info skip shows entry as enabled"
>> >  if ![runto_main] { fail "skip tests suppressed" }
>> > -gdb_test "step" "foo \\(\\) at.*" "step after deleting 1 (1)"
>> > -gdb_test "step"; # Return from foo()
>> > -gdb_test "step" "main \\(\\) at.*" "step after deleting 1 (2)"
>> > +gdb_test "step" "foo \\(\\) at.*" "step after enable 3 (1)"
>> > +gdb_test "step" ".*" "step after enable 3"; # Return from foo()
>> > +gdb_test "step" "main \\(\\) at.*" "step after enable 3 (2)"
> 1, 2, 3?
> 

Fixed.

> Okay with those fixed.

The patch here is what I committed.

-- 
Yao (齐尧)