diff options
| author | Doug Evans <dje@google.com> | 2016-02-01 15:22:05 -0800 |
|---|---|---|
| committer | Doug Evans <dje@google.com> | 2016-02-01 15:22:05 -0800 |
| commit | 9482b9fbb6414468228c618c165e397116a4a8f8 (patch) | |
| tree | 593fe0bf86add9a88877d9bff8981b8a8b30f03f /gdb | |
| parent | ccb6afd6e3e3f178a35f62e6f3745da5b399d3cd (diff) | |
| download | gdb-9482b9fbb6414468228c618c165e397116a4a8f8.zip gdb-9482b9fbb6414468228c618c165e397116a4a8f8.tar.gz gdb-9482b9fbb6414468228c618c165e397116a4a8f8.tar.bz2 | |
gdb.base/skip.exp: Clean up multiple references to same test name.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/skip.exp | 25 |
2 files changed, 18 insertions, 11 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index f5e9e7b..ab74e6e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -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 diff --git a/gdb/testsuite/gdb.base/skip.exp b/gdb/testsuite/gdb.base/skip.exp index 3fda8d5..9fa4acf 100644 --- a/gdb/testsuite/gdb.base/skip.exp +++ b/gdb/testsuite/gdb.base/skip.exp @@ -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" \ |