From eead772be8c451c77d86d8c4c07e48620f3bab8d Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Mon, 20 Mar 1995 17:09:25 +0000 Subject: [PATCH] * gdb.base/recurse.exp: Update gdb_test invocation to use new conventions and slightly simplify the matching regexp. --- gdb/testsuite/ChangeLog | 10 +++++++++ gdb/testsuite/gdb.base/recurse.exp | 35 +++++++++++++----------------- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index c55d81bc3f9..cc6896f0ead 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,15 @@ +Mon Mar 20 10:08:17 1995 Jeff Law (law@snake.cs.utah.edu) + + * gdb.base/recurse.exp: Update gdb_test invocation to use new + conventions and slightly simplify the matching regexp. + Fri Mar 17 05:43:28 1995 Jim Kingdon (kingdon@lioth.cygnus.com) + * gdb.base/break.exp: Update gdb_test invocation to use new + convention. + + * lib/gdb.exp: If noargs is not set, set it to 0. + * gdb.base/nodebug.exp: Comment out redundant test. Make name of tests unique. diff --git a/gdb/testsuite/gdb.base/recurse.exp b/gdb/testsuite/gdb.base/recurse.exp index 1bacdf4619f..02a3b933d71 100644 --- a/gdb/testsuite/gdb.base/recurse.exp +++ b/gdb/testsuite/gdb.base/recurse.exp @@ -57,17 +57,17 @@ if {[file exists $objdir/$subdir/$binfile] && [istarget "hppa*-*-bsd*"]} then { # Continue until initial set of b. send "cont\n" expect { - -re "Continuing.*Watchpoint.*, b.*Old value = 0.*New value = 10.*$prompt $" { pass "watchpoint hit, first time" } + -re "Continuing.*\[Ww\]atchpoint.*: b.*Old value = 0.*New value = 10.*$prompt $" { pass "watchpoint hit, first time" } -re ".*$prompt $" { fail "missed first watchpoint" ; return } timeout { fail "missed first watchpoint (timeout)" ; return } } # Continue inward for a few iterations - gdb_test "continue" "Breakpoint.* recurse \[(\]+a=9\[)\]+" - gdb_test "continue" "Breakpoint.* recurse \[(\]+a=8\[)\]+" - gdb_test "continue" "Breakpoint.* recurse \[(\]+a=7\[)\]+" - gdb_test "continue" "Breakpoint.* recurse \[(\]+a=6\[)\]+" - gdb_test "continue" "Breakpoint.* recurse \[(\]+a=5\[)\]+" + gdb_test "continue" "Breakpoint.* recurse \\(+a=9\\).*" + gdb_test "continue" "Breakpoint.* recurse \\(+a=8\\).*" + gdb_test "continue" "Breakpoint.* recurse \\(+a=7\\).*" + gdb_test "continue" "Breakpoint.* recurse \\(+a=6\\).*" + gdb_test "continue" "Breakpoint.* recurse \\(+a=5\\).*" # Put a watchpoint on another instance of b gdb_test "watch b" ".*\[Ww\]atchpoint \[0-9]*: b" @@ -75,7 +75,7 @@ if {[file exists $objdir/$subdir/$binfile] && [istarget "hppa*-*-bsd*"]} then { # Continue until initial set of b (second instance). send "cont\n" expect { - -re "Continuing.*Watchpoint.*, b.*Old value = 0.*New value = 5.*$prompt $" { pass "watchpoint hit (second instance)" } + -re "Continuing.*\[Ww\]atchpoint.*: b.*Old value = 0.*New value = 5.*$prompt $" { pass "watchpoint hit (second instance)" } -re ".*$prompt $" { fail "missed watchpoint (second instance)" return @@ -87,15 +87,15 @@ if {[file exists $objdir/$subdir/$binfile] && [istarget "hppa*-*-bsd*"]} then { } # Continue inward for a few iterations - gdb_test "continue" "Breakpoint.* recurse \[(\]+a=4\[)\]+" - gdb_test "continue" "Breakpoint.* recurse \[(\]+a=3\[)\]+" - gdb_test "continue" "Breakpoint.* recurse \[(\]+a=2\[)\]+" - gdb_test "continue" "Breakpoint.* recurse \[(\]+a=1\[)\]+" + gdb_test "continue" "Breakpoint.* recurse \\(+a=4\\).*" + gdb_test "continue" "Breakpoint.* recurse \\(+a=3\\).*" + gdb_test "continue" "Breakpoint.* recurse \\(+a=2\\).*" + gdb_test "continue" "Breakpoint.* recurse \\(+a=1\\).*" # Continue until second set of b (second instance). send "cont\n" expect { - -re "Continuing.*Watchpoint.*, b.*Old value = 5.*New value = 120.*return.*$prompt $" { pass "watchpoint hit, second time (second instance)" } + -re "Continuing.*\[Ww\]atchpoint.*: b.*Old value = 5.*New value = 120.*return.*$prompt $" { pass "watchpoint hit, second time (second instance)" } -re ".*$prompt $" { fail "missed watchpoint, second time (second instance)" return @@ -109,7 +109,7 @@ if {[file exists $objdir/$subdir/$binfile] && [istarget "hppa*-*-bsd*"]} then { # Continue again. We should have a watchpoint go out of scope now send "cont\n" expect { - -re "Continuing.*Watchpoint.*deleted.*recurse \[(\]+a=6\[)\]+ .*$prompt $" {pass "watchpoint deleted when leaving scope (second instance)" } + -re "Continuing.*\[Ww\]atchpoint.*deleted.*recurse \[(\]+a=6\[)\]+ .*$prompt $" {pass "watchpoint deleted when leaving scope (second instance)" } -re ".*prompt $" { fail "watchpoint not deleted when leaving scope (second instance)" return @@ -123,7 +123,7 @@ if {[file exists $objdir/$subdir/$binfile] && [istarget "hppa*-*-bsd*"]} then { # Continue until second set of b (first instance). send "cont\n" expect { - -re "Continuing.*Watchpoint.*b.*Old value = 10.*New value = 3628800.*return.*$prompt $" { pass "watchpoint hit, second time" } + -re "Continuing.*\[Ww\]atchpoint.*b.*Old value = 10.*New value = 3628800.*return.*$prompt $" { pass "watchpoint hit, second time" } -re ".*$prompt $" { fail "missed watchpoint, second time)" return @@ -137,7 +137,7 @@ if {[file exists $objdir/$subdir/$binfile] && [istarget "hppa*-*-bsd*"]} then { # Continue again. We should have a watchpoint go out of scope now send "cont\n" expect { - -re "Continuing.*Watchpoint.*deleted.*main \[(\]+\[)\]+ .*$prompt $" {pass "watchpoint deleted when leaving scope" } + -re "Continuing.*\[Ww\]atchpoint.*deleted.*main \[(\]+\[)\]+ .*$prompt $" {pass "watchpoint deleted when leaving scope" } -re ".*prompt $" { fail "watchpoint not deleted when leaving scope" return @@ -152,8 +152,3 @@ if {[file exists $objdir/$subdir/$binfile] && [istarget "hppa*-*-bsd*"]} then { # Restore the preserved old timeout value. set timeout $timeoutsave } - -if [istarget "a29k-*-udi"] then { - # FIXME: If PR 2415 is fixed, this is not needed. - gdb_target_udi -} -- 2.30.2