Re: [rfa] unify some pthreads.exp messages

[Michael Snyder <msnyder at redhat dot com>]

Andrew Cagney wrote:
> 
> Hello,
> 
> The attatched fixes a few more testsuite messages so that they are
> consistent.

This looks good to me.

> 
>         Andrew
> 
>     ---------------------------------------------------------------
> 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.
> 
> Index: gdb.threads/pthreads.exp
> ===================================================================
> RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/pthreads.exp,v
> retrieving revision 1.2
> diff -p -r1.2 pthreads.exp
> *** pthreads.exp        2000/04/07 01:14:10     1.2
> --- pthreads.exp        2001/02/08 03:19:56
> *************** proc all_threads_running {} {
> *** 142,150 ****
> 
>       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 $" {}
>         default {
>             fail "stopped before calling common_routine 15 times"
>             return 0
> --- 142,156 ----
> 
>       send_gdb "p common_routine::hits\n"
>       gdb_expect {
> !       -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
> *************** proc check_backtraces {} {
> *** 293,298 ****
> --- 299,305 ----
>       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.*" {
> *************** proc check_backtraces {} {
> *** 307,322 ****
>             }
>         }
>         -re "Breakpoint .* common_routine \\(arg=0\\).*" {
> !           fail "stopped in main thread at breakpoint for thread 2"
>         }
>         -re "Breakpoint .* common_routine \\(arg=1\\).*" {
> !           fail "stopped in main thread at breakpoint for thread 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"
>         }
>         timeout {
>             fail "continue to bkpt at common_routine in thread 2 (timeout)"
> --- 314,329 ----
>             }
>         }
>         -re "Breakpoint .* common_routine \\(arg=0\\).*" {
> !           fail "continue to bkpt at common_routine in thread 2 (arg=0)"
>         }
>         -re "Breakpoint .* common_routine \\(arg=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 (default)"
>         }
>         timeout {
>             fail "continue to bkpt at common_routine in thread 2 (timeout)"