[mti-fix-scope]

* gdb.mi/mi-watch.exp (test_watchpoint_all): New function.
Move all the tests here and run them twice, once using software
watchpoints and once using hardware watchpoints.
* gdb.mi/mi2-watch.exp (test_watchpoint_all): Likewise.
This commit is contained in:
Maciej W. Rozycki 2007-09-14 17:21:29 +00:00
parent 83a3a68b2b
commit 5509918fe4
3 changed files with 88 additions and 24 deletions

View File

@ -1,3 +1,11 @@
2007-09-14 Maciej W. Rozycki <macro@mips.com>
[mti-fix-scope]
* gdb.mi/mi-watch.exp (test_watchpoint_all): New function.
Move all the tests here and run them twice, once using software
watchpoints and once using hardware watchpoints.
* gdb.mi/mi2-watch.exp (test_watchpoint_all): Likewise.
2007-09-12 Daniel Jacobowitz <dan@codesourcery.com>
* gdb.base/solib-weak.exp (do_test): Adjust the file names for each

View File

@ -41,10 +41,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
return -1
}
mi_delete_breakpoints
mi_gdb_reinitialize_dir $srcdir/$subdir
mi_gdb_load ${binfile}
proc test_watchpoint_creation_and_listing {} {
global mi_gdb_prompt
global srcfile
@ -167,16 +163,48 @@ proc test_watchpoint_triggering {} {
}
}
# Disable hardware watchpoints if necessary.
if [target_info exists gdb,no_hardware_watchpoints] {
mi_gdb_test "-gdb-set can-use-hw-watchpoints 0" "\\^done" ""
proc test_watchpoint_all {type} {
global pf_prefix
upvar srcdir srcdir
upvar subdir subdir
upvar binfile binfile
set old_prefix $pf_prefix
lappend pf_prefix "$type:"
mi_delete_breakpoints
mi_gdb_reinitialize_dir $srcdir/$subdir
mi_gdb_load ${binfile}
mi_runto callee4
test_watchpoint_creation_and_listing
#test_rwatch_creation_and_listing
#test_awatch_creation_and_listing
test_watchpoint_triggering
set pf_prefix $old_prefix
}
mi_runto callee4
test_watchpoint_creation_and_listing
#test_rwatch_creation_and_listing
#test_awatch_creation_and_listing
test_watchpoint_triggering
# Run the tests twice, once using software watchpoints...
mi_gdb_test "567-gdb-set can-use-hw-watchpoints 0" \
"567\\^done" \
"hw watchpoints toggle (1)"
test_watchpoint_all sw
mi_gdb_exit
# ... and unless requested otherwise...
if [target_info exists gdb,no_hardware_watchpoints] {
return 0
}
mi_gdb_start
# ... once using hardware watchpoints (if available).
mi_gdb_test "890-gdb-set can-use-hw-watchpoints 1" \
"890\\^done" \
"hw watchpoints toggle (2)"
test_watchpoint_all hw
mi_gdb_exit
return 0

View File

@ -41,10 +41,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
return -1
}
mi_delete_breakpoints
mi_gdb_reinitialize_dir $srcdir/$subdir
mi_gdb_load ${binfile}
proc test_watchpoint_creation_and_listing {} {
global mi_gdb_prompt
global srcfile
@ -167,16 +163,48 @@ proc test_watchpoint_triggering {} {
}
}
# Disable hardware watchpoints if necessary.
if [target_info exists gdb,no_hardware_watchpoints] {
mi_gdb_test "-gdb-set can-use-hw-watchpoints 0" "\\^done" ""
proc test_watchpoint_all {type} {
global pf_prefix
upvar srcdir srcdir
upvar subdir subdir
upvar binfile binfile
set old_prefix $pf_prefix
lappend pf_prefix "$type:"
mi_delete_breakpoints
mi_gdb_reinitialize_dir $srcdir/$subdir
mi_gdb_load ${binfile}
mi_runto callee4
test_watchpoint_creation_and_listing
#test_rwatch_creation_and_listing
#test_awatch_creation_and_listing
test_watchpoint_triggering
set pf_prefix $old_prefix
}
mi_runto callee4
test_watchpoint_creation_and_listing
#test_rwatch_creation_and_listing
#test_awatch_creation_and_listing
test_watchpoint_triggering
# Run the tests twice, once using software watchpoints...
mi_gdb_test "567-gdb-set can-use-hw-watchpoints 0" \
"567\\^done" \
"hw watchpoints toggle (1)"
test_watchpoint_all sw
mi_gdb_exit
# ... and unless requested otherwise...
if [target_info exists gdb,no_hardware_watchpoints] {
return 0
}
mi_gdb_start
# ... once using hardware watchpoints (if available).
mi_gdb_test "890-gdb-set can-use-hw-watchpoints 1" \
"890\\^done" \
"hw watchpoints toggle (2)"
test_watchpoint_all hw
mi_gdb_exit
return 0