From cf74b8caf705c04febf1e3cb3c133d6c5d806419 Mon Sep 17 00:00:00 2001
From: Andrew Cagney <cagney@redhat.com>
Date: Thu, 15 Feb 2001 05:32:12 +0000
Subject: [PATCH] Make thread messages more consistent in pass/fail cases.

---
 gdb/testsuite/ChangeLog                |  6 ++++++
 gdb/testsuite/gdb.threads/pthreads.exp | 19 +++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 06e5576efea..1ba89d2b4e6 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 2e7f29c6ad0..88db0f0ed3e 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)"