diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/watchpoint.exp | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 927cf00..cc53c29 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ Wed Jan 31 14:21:09 1996 Jeffrey A Law (law@cygnus.com) + * gdb.base/break.exp: Don't test for program exit or exit status + if $noresults if nonzero. + * gdb.base/langs.exp: Likewise. + * gdb.base/watchpoint.exp: Likewise. + * gdb.base/default.exp: Remove extraneous call to load gdb.exp. * gdb.chill/pr-8405.exp: Move skip_chill_tests check to just before trying to compile the testcase. diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp index 0362ce4..2956313 100644 --- a/gdb/testsuite/gdb.base/watchpoint.exp +++ b/gdb/testsuite/gdb.base/watchpoint.exp @@ -27,9 +27,9 @@ set prms_id 0 set bug_id 0 set testfile "watchpoint" -set srcfile ${srcdir}/$subdir/${testfile}.c +set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} -if { [compile "${srcfile} -g -o ${binfile}"] != "" } { +if { [compile "${srcdir}/${subdir}/${srcfile} -g -o ${binfile}"] != "" } { perror "Couldn't compile ${srcfile}" return -1 } @@ -127,6 +127,7 @@ proc test_simple_watchpoint {} { global prompt global hex global decimal + global noresults # Ensure that the watchpoint is disabled when we startup. @@ -230,6 +231,8 @@ Continuing.*\[Ww\]atchpoint.*ival3.*Old value = -1.*New value = 0.*ival3 = count # Run until process exits. + if $noresults==1 then { return } + gdb_test "cont" "Continuing.*Program exited normally.*" \ "continue to exit in test_simple_watchpoint" } @@ -242,6 +245,7 @@ proc test_disabling_watchpoints {} { global srcfile global decimal global hex + global noresults # Ensure that the watchpoint is disabled when we startup. @@ -320,6 +324,8 @@ proc test_disabling_watchpoints {} { gdb_test "cont" "Continuing.*Breakpoint.*marker2 \\(\\).*" \ "disabled watchpoint skipped" + if $noresults==1 then { return } + gdb_test "cont" "Continuing.*Program exited normally.*" \ "continue to exit in test_disabling_watchpoints" } |