From 958a4e4cdee7ecff2b81785b50c5b282b7014ac2 Mon Sep 17 00:00:00 2001 From: Michael Snyder Date: Tue, 14 Nov 2000 22:12:26 +0000 Subject: [PATCH] 2000-11-03 Michael Snyder * gdb.base/a2-run.exp: Use gdb_skip_stdio_test. * gdb.base/corefile.exp: Expect the message "Program is being debugged already" when we send the "corefile" command, since the preceeding gdb_load may have connected gdb to a remote target. * gdb.base/display.exp: Disable hardware watchpoints if new board info variable "no_hardware_watchpoints" is true. Replace single-letter commands with more readable ones. * gdb.base/recurse.exp (recurse_tests): Disable hardware watchpoints if new board info variable "no_hardware_watchpoints" is true. * gdb.base/restore.exp (restore_tests): Call gdb_skip_stdio_tests to see if stdio (printf) testing is possible. * gdb.base/watchpoint.exp: Disable hardware watchpoints if new board info variable "no_hardware_watchpoints" is true. Use new proc "gdb_skip_stdio_tests" to see if printf tests are possible. --- gdb/testsuite/ChangeLog | 17 ++++++++++ gdb/testsuite/gdb.base/a2-run.exp | 4 +-- gdb/testsuite/gdb.base/corefile.exp | 5 +++ gdb/testsuite/gdb.base/display.exp | 49 +++++++++++++++------------ gdb/testsuite/gdb.base/recurse.exp | 5 +++ gdb/testsuite/gdb.base/restore.exp | 21 +++++++----- gdb/testsuite/gdb.base/watchpoint.exp | 11 ++++-- 7 files changed, 77 insertions(+), 35 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 4a1f04e336..45efe3738f 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,20 @@ +2000-11-03 Michael Snyder + + * gdb.base/a2-run.exp: Use gdb_skip_stdio_test. + * gdb.base/corefile.exp: Expect the message "Program is being + debugged already" when we send the "corefile" command, since + the preceeding gdb_load may have connected gdb to a remote target. + * gdb.base/display.exp: Disable hardware watchpoints if new + board info variable "no_hardware_watchpoints" is true. + Replace single-letter commands with more readable ones. + * gdb.base/recurse.exp (recurse_tests): Disable hardware watchpoints + if new board info variable "no_hardware_watchpoints" is true. + * gdb.base/restore.exp (restore_tests): Call gdb_skip_stdio_tests + to see if stdio (printf) testing is possible. + * gdb.base/watchpoint.exp: Disable hardware watchpoints if new + board info variable "no_hardware_watchpoints" is true. Use new + proc "gdb_skip_stdio_tests" to see if printf tests are possible. + 2000-11-13 Fernando Nasser From Orjan Friberg : diff --git a/gdb/testsuite/gdb.base/a2-run.exp b/gdb/testsuite/gdb.base/a2-run.exp index 4341d27de2..c00442ec22 100644 --- a/gdb/testsuite/gdb.base/a2-run.exp +++ b/gdb/testsuite/gdb.base/a2-run.exp @@ -26,8 +26,8 @@ if [target_info exists noargs] then { return } -if [target_info exists gdb,noinferiorio] { - verbose "Skipping a2-run.exp because of noinferiorio." +# Can't do this test without stdio support. +if [gdb_skip_stdio_test "a2run.exp"] { return } diff --git a/gdb/testsuite/gdb.base/corefile.exp b/gdb/testsuite/gdb.base/corefile.exp index f998f88665..44c9427f0c 100644 --- a/gdb/testsuite/gdb.base/corefile.exp +++ b/gdb/testsuite/gdb.base/corefile.exp @@ -164,6 +164,11 @@ gdb_load ${binfile} send_gdb "core-file $objdir/$subdir/corefile\n" gdb_expect { + -re ".* program is being debugged already.*y or n. $" { + # gdb_load may connect us to a gdbserver. + send_gdb "y\n" + exp_continue; + } -re "Core was generated by .*coremaker.*\r\n\#0 .*\(\).*\r\n$gdb_prompt $" { pass "core-file command" } diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp index b9e42185cb..37007487b0 100644 --- a/gdb/testsuite/gdb.base/display.exp +++ b/gdb/testsuite/gdb.base/display.exp @@ -70,13 +70,18 @@ if ![runto_main] then { continue } -gdb_test "b 14" ".*Breakpoint 2.*" "break do_loops" -gdb_test "c" ".*Breakpoint 2, do_loops.*" "get to do_loops" +# Disable hardware watchpoints if necessary. +if [target_info exists gdb,no_hardware_watchpoints] { + gdb_test "set can-use-hw-watchpoints 0" "" "" +} + +gdb_test "break 14" ".*Breakpoint 2.*" "break do_loops" +gdb_test "cont" ".*Breakpoint 2, do_loops.*" "get to do_loops" # Create stopping points. # -gdb_test "wat sum" ".*\[Ww\]atchpoint 3: sum.*" "set watch" -gdb_test "b 19" ".*Breakpoint 4.*" "break 19" +gdb_test "watch sum" ".*\[Ww\]atchpoint 3: sum.*" "set watch" +gdb_test "break 19" ".*Breakpoint 4.*" "break 19" # Create displays for those points # @@ -89,8 +94,8 @@ gdb_test "disp/s &sum" ".*5: x/s &sum $hex.*sum.:.*" "display/s &sum" # Hit the displays # -gdb_test "c" ".*\[Ww\]atchpoint 3: sum.*\[1-9\]*: x/s &sum.*\[1-9\]*: /f sum = 1.40129846e.45\r\n\[1-9\]*: x/i &k.*\r\n\[1-9\]*: /x j = 0x0\r\n\[1-9\]*: i = 0.*" "first disp" -gdb_test "c" ".*\[Ww\]atchpoint 3: sum.*\[1-9\]*: x/s &sum.*\[1-9\]*: /f sum = 2.80259693e.45\r\n\[1-9\]*: x/i &k.*\r\n\[1-9\]*: /x j = 0x0.*\[1-9\]*: i = 0.*" "second disp" +gdb_test "cont" ".*\[Ww\]atchpoint 3: sum.*\[1-9\]*: x/s &sum.*\[1-9\]*: /f sum = 1.40129846e.45\r\n\[1-9\]*: x/i &k.*\r\n\[1-9\]*: /x j = 0x0\r\n\[1-9\]*: i = 0.*" "first disp" +gdb_test "cont" ".*\[Ww\]atchpoint 3: sum.*\[1-9\]*: x/s &sum.*\[1-9\]*: /f sum = 2.80259693e.45\r\n\[1-9\]*: x/i &k.*\r\n\[1-9\]*: /x j = 0x0.*\[1-9\]*: i = 0.*" "second disp" gdb_test "enab disp 6" ".*No display number 6..*" "catch err" gdb_test "disab disp 1" ".*" "disab disp 1" @@ -98,9 +103,9 @@ gdb_test "disab disp 2" ".*" "disab disp 2" gdb_test "enab disp 1" ".*" "re-enab" gdb_test "enab disp 1" ".*" "re-enab of enab" gdb_test "undisp 5" ".*" "undisp" -gdb_test "i disp" ".*Auto-display expressions now in effect.*y /f sum.*y /1bi &k.*n /x j.*y i.*" "info disp" +gdb_test "info disp" ".*Auto-display expressions now in effect.*y /f sum.*y /1bi &k.*n /x j.*y i.*" "info disp" -gdb_test "c" ".*\[Ww\]atch.*4.20389539e-45.*.*i = 0.*" "next hit" +gdb_test "cont" ".*\[Ww\]atch.*4.20389539e-45.*.*i = 0.*" "next hit" send_gdb "undisp\n" gdb_expect { @@ -126,7 +131,7 @@ gdb_expect { } gdb_test "disab 3" ".*.*" "disab 3" -gdb_test "c" ".*Breakpoint 4.*" "watch off" +gdb_test "cont" ".*Breakpoint 4.*" "watch off" # Now the printf tests # @@ -153,9 +158,9 @@ gdb_expect { } } -gdb_test "s" ".*do_vars.*.*27.*" -gdb_test "tb 37" ".*Breakpoint 5 a.*" -gdb_test "c" ".*do_vars.*37.*37.*" +gdb_test "step" ".*do_vars.*.*27.*" +gdb_test "tbreak 37" ".*Breakpoint 5 a.*" +gdb_test "cont" ".*do_vars.*37.*37.*" # Beat on printf a bit # @@ -168,10 +173,10 @@ gdb_test "printf \"\"" ".*" "re-set term" gdb_test "printf \"\\w\"" ".*Unrecognized escape character.*" gdb_test "printf \"%d\" j" ".*Invalid argument syntax.*" -# play with "p", too +# play with "print", too # -gdb_test "p/r j" ".*Undefined output format.*" -gdb_test "p j" ".*" "debug test output" +gdb_test "print/r j" ".*Undefined output format.*" +gdb_test "print j" ".*" "debug test output" # x/0 j doesn't produce any output and terminates PA64 process when testing if [istarget "hppa2.0w-hp-hpux11*"] { @@ -183,15 +188,15 @@ if [istarget "hppa*-hp-hpux*"] { # on HP-UX you could access the first page without getting an error gdb_test "x/rx j" ".*(Cannot access|Error accessing) memory.*|.*0xa:\[ \t\]*\[0-9\]+.*" } -gdb_test "p/0 j" ".*Item count other than 1 is meaningless.*" "p/0 j" -gdb_test "p/s sum" ".*Format letter.*is meaningless.*" " no s" -gdb_test "p/i sum" ".*Format letter.*is meaningless.*.*" "no i" -gdb_test "p/a &sum" ".*= $hex.*.*" +gdb_test "print/0 j" ".*Item count other than 1 is meaningless.*" "print/0 j" +gdb_test "print/s sum" ".*Format letter.*is meaningless.*" " no s" +gdb_test "print/i sum" ".*Format letter.*is meaningless.*.*" "no i" +gdb_test "print/a &sum" ".*= $hex.*.*" # If the constant below is larger than the length of main, then # this test will (incorrectly) fail. So use a small number. -gdb_test "p/a main+4" ".*= $hex.*<.*>.*" -gdb_test "p/a \$pc" ".*= $hex.*.*" -gdb_test "p/a &&j" ".*A .* error in expression.*" +gdb_test "print/a main+4" ".*= $hex.*<.*>.*" +gdb_test "print/a \$pc" ".*= $hex.*.*" +gdb_test "print/a &&j" ".*A .* error in expression.*" # Done! # diff --git a/gdb/testsuite/gdb.base/recurse.exp b/gdb/testsuite/gdb.base/recurse.exp index ac994f24d5..c222233b97 100644 --- a/gdb/testsuite/gdb.base/recurse.exp +++ b/gdb/testsuite/gdb.base/recurse.exp @@ -42,6 +42,11 @@ gdb_load ${binfile} proc recurse_tests {} { + # Disable hardware watchpoints if necessary. + if [target_info exists gdb,no_hardware_watchpoints] { + gdb_test "set can-use-hw-watchpoints 0" "" "" + } + if [runto recurse] then { # First we need to step over the assignment of b, so it has a known # value. diff --git a/gdb/testsuite/gdb.base/restore.exp b/gdb/testsuite/gdb.base/restore.exp index 8cf5035f16..ff563efa5e 100644 --- a/gdb/testsuite/gdb.base/restore.exp +++ b/gdb/testsuite/gdb.base/restore.exp @@ -87,19 +87,24 @@ proc restore_tests { } { } } - send_gdb "continue\n" + if ![gdb_skip_stdio_test "run to completion"] { + send_gdb "continue\n" - gdb_expect { - -re "exiting" { - pass "run to completion" - } - timeout { - fail "(timeout) run to completion" - } + gdb_expect { + -re "exiting" { + pass "run to completion" + } + timeout { + fail "(timeout) run to completion" + } + } + } else { + gdb_test "continue" "" "" } } + # Start with a fresh gdb. gdb_exit diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp index df796baf29..c096306e93 100644 --- a/gdb/testsuite/gdb.base/watchpoint.exp +++ b/gdb/testsuite/gdb.base/watchpoint.exp @@ -63,6 +63,11 @@ proc initialize {} { global srcfile global wp_set + # Disable hardware watchpoints if necessary. + if [target_info exists gdb,no_hardware_watchpoints] { + gdb_test "set can-use-hw-watchpoints 0" "" "" + } + if [gdb_test "break marker1" "Breakpoint 1 at $hex: file .*$srcfile, line $decimal.*" "set breakpoint at marker1" ] { return 0; } @@ -460,9 +465,9 @@ proc test_stepping {} { proc test_watchpoint_triggered_in_syscall {} { global gdb_prompt - if [target_info exists gdb,noinferiorio] { - verbose "Skipping test_watchpoint_triggered_in_syscall due to noinferiorio" - return + # These tests won't work without printf support. + if [gdb_skip_stdio_test "watchpoints triggered in syscall"] { + return; } # Run until we get to the first marker function. set x 0