aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorAndrew Cagney <cagney@redhat.com>2001-02-15 05:32:12 +0000
committerAndrew Cagney <cagney@redhat.com>2001-02-15 05:32:12 +0000
commitcf74b8caf705c04febf1e3cb3c133d6c5d806419 (patch)
treeff3e73d1f4fd885fcad4fabf8af55449b0c02099 /gdb
parent44e23e575b7a78c3c9a6a65f49abbf8f6abf52fb (diff)
downloadgdb-cf74b8caf705c04febf1e3cb3c133d6c5d806419.zip
gdb-cf74b8caf705c04febf1e3cb3c133d6c5d806419.tar.gz
gdb-cf74b8caf705c04febf1e3cb3c133d6c5d806419.tar.bz2
Make thread messages more consistent in pass/fail cases.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/gdb.threads/pthreads.exp19
2 files changed, 19 insertions, 6 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 06e5576..1ba89d2 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+Sun Feb 4 17:32:21 2001 Andrew Cagney <cagney@redhat.com>
+
+ * gdb.threads/pthreads.exp: Unify pass/fail messages for
+ ``continue to bkpt at common_routine in thread 2'' and ``stopped
+ before calling common_routine 15 times'' tests.
+
2001-02-11 Michael Chastain <chastain@redhat.com>
* gdb.c++/cplusfuncs.cc (dm_type_char_star): New function.
diff --git a/gdb/testsuite/gdb.threads/pthreads.exp b/gdb/testsuite/gdb.threads/pthreads.exp
index 2e7f29c..88db0f0 100644
--- a/gdb/testsuite/gdb.threads/pthreads.exp
+++ b/gdb/testsuite/gdb.threads/pthreads.exp
@@ -142,9 +142,15 @@ proc all_threads_running {} {
send_gdb "p common_routine::hits\n"
gdb_expect {
- -re ".*= 15\r\n$gdb_prompt $" {}
- -re ".*= 16\r\n$gdb_prompt $" {}
- -re ".*= 17\r\n$gdb_prompt $" {}
+ -re ".*= 15\r\n$gdb_prompt $" {
+ pass "stopped before calling common_routine 15 times"
+ }
+ -re ".*= 16\r\n$gdb_prompt $" {
+ pass "stopped before calling common_routine 15 times (16 times)"
+ }
+ -re ".*= 17\r\n$gdb_prompt $" {
+ pass "stopped before calling common_routine 15 times (17 times)"
+ }
default {
fail "stopped before calling common_routine 15 times"
return 0
@@ -293,6 +299,7 @@ proc check_backtraces {} {
send_gdb "continue\n"
gdb_expect {
-re "Breakpoint .* common_routine \\(arg=2\\).*" {
+ pass "continue to bkpt at common_routine in thread 2"
send_gdb "backtrace\n"
gdb_expect {
-re "#0.*common_routine \\(arg=2\\).*#1.*thread2.*" {
@@ -307,16 +314,16 @@ proc check_backtraces {} {
}
}
-re "Breakpoint .* common_routine \\(arg=0\\).*" {
- fail "stopped in main thread at breakpoint for thread 2"
+ fail "continue to bkpt at common_routine in thread 2 (arg=0)"
}
-re "Breakpoint .* common_routine \\(arg=1\\).*" {
- fail "stopped in main thread at breakpoint for thread 1"
+ fail "continue to bkpt at common_routine in thread 2 (arg=1)"
}
-re ".*$gdb_prompt" {
fail "continue to bkpt at common_routine in thread 2"
}
default {
- fail "continue to bkpt at common_routine in thread 2"
+ fail "continue to bkpt at common_routine in thread 2 (default)"
}
timeout {
fail "continue to bkpt at common_routine in thread 2 (timeout)"