2010-05-27 Michael Snyder <msnyder@msnyder-server.eng.vmware.com>

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / sigall.exp

diff --git a/gdb/testsuite/gdb.base/sigall.exp b/gdb/testsuite/gdb.base/sigall.exp
index cd436c722c35508027bb9cf674f67328422250b4..1fbf3e53b30d9e7c50e1feacb9d575525784f3d1 100644 (file)
--- a/gdb/testsuite/gdb.base/sigall.exp
+++ b/gdb/testsuite/gdb.base/sigall.exp
@@ -54,22 +54,12 @@ proc test_one_sig {nextsig} {
     set need_another_continue 1
     set missed_handler 0
     if $this_sig_supported then {
-       send_gdb "continue\n"
        if { $thissig == "IO" } {
            setup_xfail "i*86-pc-linuxoldld-gnu" "i*86-pc-linuxaout-gnu"
        }
-       gdb_expect {
-           -re "Continuing.*Program received signal SIG$thissig.*$gdb_prompt $" {
-               pass "get signal $thissig"
-           }
-           -re ".*$gdb_prompt $" {
-               fail "get signal $thissig"
-               set need_another_continue 0
-           }
-           default {
-               fail "get signal $thissig (eof or timeout)"
-           }
-       }
+       gdb_test "continue" \
+           "Continuing.*Program received signal SIG$thissig.*" \
+           "get signal $thissig"
     }
     if [ istarget "alpha-dec-osf3*" ] then {
        # OSF/1-3.x is unable to continue with a job control stop signal.
@@ -84,7 +74,6 @@ proc test_one_sig {nextsig} {
     }
 
     if $need_another_continue then {
-       send_gdb "continue\n"
        if { $thissig == "URG" } {
            setup_xfail "i*86-pc-linuxoldld-gnu" "i*86-pc-linuxaout-gnu"
        }
@@ -92,7 +81,7 @@ proc test_one_sig {nextsig} {
        if { $thissig == "PRIO" } {
            setup_xfail "*-*-*lynx*"
        }
-       gdb_expect {
+       gdb_test_multiple "continue" "send signal $thissig" {
            -re "Breakpoint.*handle_$thissig.*$gdb_prompt $" {
                pass "send signal $thissig"
            }
@@ -104,8 +93,7 @@ proc test_one_sig {nextsig} {
     }
 
     if { $missed_handler == "0" } then {
-        send_gdb "signal 0\n"
-        gdb_expect {
+       gdb_test_multiple "signal 0" "advance to $nextsig" {
            -re "Breakpoint.*gen_$nextsig.*kill.*$gdb_prompt $" {
                pass "advance to $nextsig"
                set sig_supported 1
@@ -114,8 +102,6 @@ proc test_one_sig {nextsig} {
                pass "advance to $nextsig"
                set sig_supported 0
            }
-           -re ".*$gdb_prompt $" { fail "advance to $nextsig" }
-           default { fail "advance to $nextsig (eof or timeout)" }
         }
     }
     set thissig $nextsig