gdb.base/skip.exp: Clean up multiple references to same test name.

This commit is contained in:
Doug Evans 2016-02-01 15:22:05 -08:00
parent ccb6afd6e3
commit 9482b9fbb6
2 changed files with 18 additions and 11 deletions

View File

@ -1,3 +1,7 @@
2016-02-01 Doug Evans <dje@google.com>
* gdb.base/skip.exp: Clean up multiple references to same test name.
2016-02-01 Pedro Alves <palves@redhat.com>
PR remote/19496

View File

@ -100,9 +100,10 @@ gdb_test "info skip" \
"info skip (delete 1)"
if ![runto_main] { fail "skip tests suppressed" }
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)"
set test "step after deleting 1"
gdb_test "step" "foo \\(\\) at.*" "$test (1)"
gdb_test "step" ".*" "$test (2)" ; # Return from foo()
gdb_test "step" "main \\(\\) at.*" "$test (3)"
#
# Now disable the skiplist entry for skip1.c. We should now
@ -114,11 +115,12 @@ gdb_test "info skip 3" ".*\\n3\\s+file\\s+n.*" \
"info skip shows entry as disabled"
if ![runto_main] { fail "skip tests suppressed" }
gdb_test "step" "bar \\(\\) at.*" "step after disabling 3 (1)"
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)"
set test "step after disabling 3"
gdb_test "step" "bar \\(\\) at.*" "$test (1)"
gdb_test "step" ".*" "$test (2)"; # Return from foo()
gdb_test "step" "foo \\(\\) at.*" "$test (3)"
gdb_test "step" ".*" "$test (4)"; # Return from bar()
gdb_test "step" "main \\(\\) at.*" "$test (5)"
#
# Enable skiplist entry 3 and make sure we step over it like before.
@ -128,9 +130,10 @@ 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 enable 3 (1)"
gdb_test "step" ".*" "step after enable 3 (2)"; # Return from foo()
gdb_test "step" "main \\(\\) at.*" "step after enable 3 (3)"
set test "step after enable 3"
gdb_test "step" "foo \\(\\) at.*" "$test (1)"
gdb_test "step" ".*" "$test (2)"; # Return from foo()
gdb_test "step" "main \\(\\) at.*" "$test (3)"
gdb_test "skip disable"
gdb_test "info skip" \