diff options
| author | Pedro Alves <palves@redhat.com> | 2015-03-09 19:02:30 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2015-04-10 19:49:00 +0100 |
| commit | 9ee417720b2f25c56a9738569b63f686cbc8584f (patch) | |
| tree | e2118228a644559f44a34c349dc0f75724871c3a | |
| parent | 07473109e11e41d979c33b839551ac1c6f8495b9 (diff) | |
| download | binutils-gdb-9ee417720b2f25c56a9738569b63f686cbc8584f.tar.gz | |
Cleanup signal-while-stepping-over-bp-other-thread.exp
gdb/testsuite/ChangeLog:
2015-04-10 Pedro Alves <palves@redhat.com>
* gdb.threads/signal-while-stepping-over-bp-other-thread.exp: Use
gdb_test_sequence and gdb_assert.
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.exp | 20 |
2 files changed, 15 insertions, 10 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index e482bbbc14e..775e6f98d12 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2015-04-10 Pedro Alves <palves@redhat.com> + * gdb.threads/signal-while-stepping-over-bp-other-thread.exp: Use + gdb_test_sequence and gdb_assert. + +2015-04-10 Pedro Alves <palves@redhat.com> + * gdb.threads/step-over-trips-on-watchpoint.exp (do_test): Use test messages that don't include the breakpoint address. diff --git a/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.exp b/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.exp index bb00c50c70f..3201b1f36e0 100644 --- a/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.exp +++ b/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.exp @@ -95,19 +95,19 @@ gdb_test "set scheduler-locking off" # Make sure we're exercising the paths we want to. gdb_test "set debug infrun 1" -gdb_test \ - "step" \ - ".*need to step-over.*resume \\(step=1.*signal arrived while stepping over breakpoint.*switching back to stepped thread.*stepped to a different line.*callme.*" \ - "step" +set test "step" +gdb_test_sequence $test $test { + "need to step-over" + "resume \\(step=1" + "signal arrived while stepping over breakpoint" + "switching back to stepped thread" + "stepped to a different line" + "callme" +} set cnt_after [get_value "args\[$my_number\]" "get count after step"] # Test that GDB doesn't inadvertently resume the stepped thread when a # signal arrives while stepping over a breakpoint in another thread. -set test "stepped thread under control" -if { $cnt_before + 1 == $cnt_after } { - pass $test -} else { - fail $test -} +gdb_assert { $cnt_before + 1 == $cnt_after } "stepped thread under control" |