diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/watchpoint.exp | 13 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 16 |
3 files changed, 13 insertions, 24 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 03334c0..2e8a09c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +Thu Feb 6 12:46:14 1997 Jeffrey A Law (law@cygnus.com) + + * gdb.base/break.exp: Check for gdb,noresults before testing + exit status and/or results from the target. + * gdb.base/watchpoint.exp, gdb.base/langs.exp: Likewise. + * lib/gdb.exp: Remove old (now bogus) initialization of + noinferior, noargs, noresults and nosignals. + Tue Feb 4 21:52:17 1997 Bob Manson <manson@charmed.cygnus.com> * config/sh.exp: New file. diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp index e4bf9b4..99b58af 100644 --- a/gdb/testsuite/gdb.base/watchpoint.exp +++ b/gdb/testsuite/gdb.base/watchpoint.exp @@ -103,7 +103,6 @@ proc test_simple_watchpoint {} { global gdb_prompt global hex global decimal - global noresults # Ensure that the watchpoint is disabled when we startup. @@ -194,7 +193,7 @@ Continuing.*\[Ww\]atchpoint.*ival3.*Old value = -1.*New value = 0.*ival3 = count # Run until process exits. - if $noresults==1 then { return } + if [target_info exists gdb,noresults] { return } gdb_test "cont" "Continuing.*Program exited normally.*" \ "continue to exit in test_simple_watchpoint" @@ -208,7 +207,6 @@ proc test_disabling_watchpoints {} { global srcfile global decimal global hex - global noresults # Ensure that the watchpoint is disabled when we startup. @@ -266,7 +264,7 @@ proc test_disabling_watchpoints {} { gdb_test "cont" "Continuing.*Breakpoint.*marker2 \\(\\).*" \ "disabled watchpoint skipped" - if $noresults==1 then { return } + if [target_info exists gdb,noresults] { return } gdb_test "cont" "Continuing.*Program exited normally.*" \ "continue to exit in test_disabling_watchpoints" @@ -372,7 +370,6 @@ proc test_stepping {} { # Test stepping and other mundane operations with watchpoints enabled proc test_watchpoint_triggered_in_syscall {} { global gdb_prompt - global noresults if [target_info exists gdb,noinferiorio] { verbose "Skipping test_watchpoint_triggered_in_syscall due to noinferiorio" @@ -451,7 +448,7 @@ proc test_watchpoint_triggered_in_syscall {} { # Disable everything so we can finish the program at full speed gdb_test "disable" "" "disable in test_watchpoint_triggered_in_syscall" - if $noresults==1 then { return } + if [target_info exists gdb,noresults] { return } gdb_test "cont" "Continuing.*Program exited normally.*" \ "continue to exit in test_watchpoint_triggered_in_syscall" @@ -463,7 +460,6 @@ proc test_watchpoint_triggered_in_syscall {} { proc test_complex_watchpoint {} { global gdb_prompt - global noresults if [runto marker4] then { gdb_test "watch ptr1->val" ".*\[Ww\]atchpoint \[0-9\]*: ptr1->val" @@ -480,7 +476,8 @@ proc test_complex_watchpoint {} { # Disable everything so we can finish the program at full speed gdb_test "disable" "" "disable in test_complex_watchpoint" - if $noresults==1 then { return } + if [target_info exists gdb,noresults] { return } + gdb_test "cont" "Continuing.*Program exited normally.*" \ "continue to exit in test_complex_watchpoint" diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 157c210..6024df3 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -60,22 +60,6 @@ if ![info exists prompt] then { set gdb_prompt "\[(\]gdb\[)\]" } -if ![info exists noargs] then { - set noargs 0 -} - -if ![info exists nosignals] then { - set nosignals 0 -} - -if ![info exists noinferiorio] then { - set noinferiorio 0 -} - -if ![info exists noresults] then { - set noresults 0 -} - # # gdb_version -- extract and print the version number of GDB # |